Init MidiService once system user gets unlocked.
Bug: 28621670
Change-Id: I358aa8db6d1408c317f4ca66b4e5c5cbbcfe0826
diff --git a/services/midi/java/com/android/server/midi/MidiService.java b/services/midi/java/com/android/server/midi/MidiService.java
index 723be24..1c18c9b 100644
--- a/services/midi/java/com/android/server/midi/MidiService.java
+++ b/services/midi/java/com/android/server/midi/MidiService.java
@@ -41,6 +41,7 @@
import android.os.IBinder;
import android.os.Process;
import android.os.RemoteException;
+import android.os.UserHandle;
import android.util.Log;
import com.android.internal.content.PackageMonitor;
@@ -71,6 +72,13 @@
mMidiService = new MidiService(getContext());
publishBinderService(Context.MIDI_SERVICE, mMidiService);
}
+
+ @Override
+ public void onUnlockUser(int userHandle) {
+ if (userHandle == UserHandle.USER_SYSTEM) {
+ mMidiService.onUnlockUser();
+ }
+ }
}
private static final String TAG = "MidiService";
@@ -97,7 +105,7 @@
private final PackageManager mPackageManager;
// UID of BluetoothMidiService
- private final int mBluetoothServiceUid;
+ private int mBluetoothServiceUid;
// PackageMonitor for listening to package changes
private final PackageMonitor mPackageMonitor = new PackageMonitor() {
@@ -557,7 +565,12 @@
public MidiService(Context context) {
mContext = context;
mPackageManager = context.getPackageManager();
- mPackageMonitor.register(context, null, true);
+
+ mBluetoothServiceUid = -1;
+ }
+
+ private void onUnlockUser() {
+ mPackageMonitor.register(mContext, null, true);
Intent intent = new Intent(MidiDeviceService.SERVICE_INTERFACE);
List<ResolveInfo> resolveInfos = mPackageManager.queryIntentServices(intent,
@@ -583,7 +596,7 @@
} else {
mBluetoothServiceUid = -1;
}
- }
+ }
@Override
public void registerListener(IBinder token, IMidiDeviceListener listener) {