Merge "MIDI: Fix UserManager.getMainUser() crash" into main

This commit is contained in:
Treehugger Robot
2023-08-01 21:51:03 +00:00
committed by Android (Google) Code Review

View File

@@ -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) {