Merge "MIDI: Log userId" into main (600444e4) · Commits · e / os / android_frameworks_base

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

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -287,6 +287,7 @@ public class MidiService extends IMidiManager.Stub {
	}		}

	public void deviceAdded(Device device) {		public void deviceAdded(Device device) {
			Log.d(TAG, "deviceAdded() " + device.getUserId() + " userId:" + getUserId());
	// ignore devices that our client cannot access		// ignore devices that our client cannot access
	if (!device.isUidAllowed(mUid) \|\| !device.isUserIdAllowed(getUserId())) return;		if (!device.isUidAllowed(mUid) \|\| !device.isUserIdAllowed(getUserId())) return;

	@@ -301,6 +302,7 @@ public class MidiService extends IMidiManager.Stub {
	}		}

	public void deviceRemoved(Device device) {		public void deviceRemoved(Device device) {
			Log.d(TAG, "deviceRemoved() " + device.getUserId() + " userId:" + getUserId());
	// ignore devices that our client cannot access		// ignore devices that our client cannot access
	if (!device.isUidAllowed(mUid) \|\| !device.isUserIdAllowed(getUserId())) return;		if (!device.isUidAllowed(mUid) \|\| !device.isUserIdAllowed(getUserId())) return;

	@@ -315,6 +317,7 @@ public class MidiService extends IMidiManager.Stub {
	}		}

	public void deviceStatusChanged(Device device, MidiDeviceStatus status) {		public void deviceStatusChanged(Device device, MidiDeviceStatus status) {
			Log.d(TAG, "deviceStatusChanged() " + device.getUserId() + " userId:" + getUserId());
	// ignore devices that our client cannot access		// ignore devices that our client cannot access
	if (!device.isUidAllowed(mUid) \|\| !device.isUserIdAllowed(getUserId())) return;		if (!device.isUidAllowed(mUid) \|\| !device.isUserIdAllowed(getUserId())) return;

	@@ -1303,7 +1306,7 @@ public class MidiService extends IMidiManager.Stub {
	String[] inputPortNames, String[] outputPortNames, Bundle properties,		String[] inputPortNames, String[] outputPortNames, Bundle properties,
	IMidiDeviceServer server, ServiceInfo serviceInfo,		IMidiDeviceServer server, ServiceInfo serviceInfo,
	boolean isPrivate, int uid, int defaultProtocol, int userId) {		boolean isPrivate, int uid, int defaultProtocol, int userId) {
	Log.d(TAG, "addDeviceLocked()" + uid + " type:" + type);		Log.d(TAG, "addDeviceLocked() " + uid + " type:" + type + " userId:" + userId);

	// Limit the number of devices per app.		// Limit the number of devices per app.
	int deviceCountForApp = 0;		int deviceCountForApp = 0;