summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Robert Wu <robertwu@google.com> 2023-08-01 20:40:58 +0000
committer Robert Wu <robertwu@google.com> 2023-08-01 20:40:58 +0000
commitb6898d1c34d3d6d1655c21e183c8bebf8957afdc (patch)
tree2ec72603d4a0f426d00cadad1df00ba09505a985
parent080276b44c2a4b49163fc147aa3bb5c8684df653 (diff)
MIDI: Fix UserManager.getMainUser() crash
There is no need to call getMainUser() when we can simply get the user id from the app uid. Bug: 293928587 Test: Connect Jamstick to MIDI+BTLE app Test: Verify MidiScope sees the device and receives data Change-Id: If2adb5118132dc445652c902ace29f0b1fccb057
-rw-r--r--services/midi/java/com/android/server/midi/MidiService.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/services/midi/java/com/android/server/midi/MidiService.java b/services/midi/java/com/android/server/midi/MidiService.java
index c0cfa53a0a98..486ddb4cb354 100644
--- a/services/midi/java/com/android/server/midi/MidiService.java
+++ b/services/midi/java/com/android/server/midi/MidiService.java
@@ -420,14 +420,11 @@ public class MidiService extends IMidiManager.Stub {
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) {