commit 15eb9592c378249c95563bbaacd0bda0224f829d
author Robert Wu <robertwu@google.com> Wed Aug 02 17:02:31 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 02 17:02:31 2023 +0000
tree 82d667d8a932fae29d700a9eb24d714abcc5e558
parent 7b9199ced02b899c2643661a82f4e921bc4429f4
parent ed4939f199ca25008191edce1362746fe780742e

Merge "MIDI: Fix UserManager.getMainUser() crash" into udc-qpr-dev

services/midi/java/com/android/server/midi/MidiService.java

diff --git a/services/midi/java/com/android/server/midi/MidiService.java b/services/midi/java/com/android/server/midi/MidiService.java
index f660b42..fe979b6 100644
--- a/services/midi/java/com/android/server/midi/MidiService.java
+++ b/services/midi/java/com/android/server/midi/MidiService.java
@@ -418,14 +418,11 @@
             setDeviceServer(server);
         }
 
-        @RequiresPermission(anyOf = {Manifest.permission.QUERY_USERS,
-                Manifest.permission.CREATE_USERS,
-                Manifest.permission.MANAGE_USERS})
         public Device(BluetoothDevice bluetoothDevice) {
             mBluetoothDevice = bluetoothDevice;
             mServiceInfo = null;
             mUid = mBluetoothServiceUid;
-            mUserId = mUserManager.getMainUser().getIdentifier();
+            mUserId = UserHandle.getUserId(mUid);
         }
 
         private void setDeviceServer(IMidiDeviceServer server) {