summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--services/midi/java/com/android/server/midi/MidiService.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/services/midi/java/com/android/server/midi/MidiService.java b/services/midi/java/com/android/server/midi/MidiService.java
index a212812b0768..c16c61271280 100644
--- a/services/midi/java/com/android/server/midi/MidiService.java
+++ b/services/midi/java/com/android/server/midi/MidiService.java
@@ -1012,7 +1012,11 @@ public class MidiService extends IMidiManager.Stub {
}
}
- if (user.getUserIdentifier() == mUserManager.getMainUser().getIdentifier()) {
+ // Allow only the main user to create BluetoothMidiService.
+ // If there is no main user, allow all users to create it.
+ UserHandle mainUser = mUserManager.getMainUser();
+ if ((mainUser == null)
+ || (user.getUserIdentifier() == mainUser.getIdentifier())) {
PackageInfo info;
try {
info = mPackageManager.getPackageInfoAsUser(