Merge "MediaSession2Service: Log ControllerInfo in connection process" into qt-dev am: 10a591bc43 (00e76111) · Commits · e / os / android_frameworks_base

media/apex/java/android/media/MediaSession2Service.java

+6 −5

Original line number	Original line	Diff line number	Diff line
	@@ -370,10 +370,6 @@ public abstract class MediaSession2Service extends Service {
	}		}
	return;		return;
	}		}
	if (DEBUG) {
	Log.d(TAG, "Handling incoming connection request from the"
	+ " controller, controller=" + caller + ", uid=" + uid);
	}

	String callingPkg = connectionRequest.getString(KEY_PACKAGE_NAME);		String callingPkg = connectionRequest.getString(KEY_PACKAGE_NAME);
	// The Binder.getCallingPid() can be 0 for an oneway call from the		// The Binder.getCallingPid() can be 0 for an oneway call from the
	@@ -389,13 +385,18 @@ public abstract class MediaSession2Service extends Service {
	caller,		caller,
	connectionRequest.getBundle(KEY_CONNECTION_HINTS));		connectionRequest.getBundle(KEY_CONNECTION_HINTS));

			if (DEBUG) {
			Log.d(TAG, "Handling incoming connection request from the"
			+ " controller=" + controllerInfo);
			}

	final MediaSession2 session;		final MediaSession2 session;
	session = service.onGetSession(controllerInfo);		session = service.onGetSession(controllerInfo);

	if (session == null) {		if (session == null) {
	if (DEBUG) {		if (DEBUG) {
	Log.d(TAG, "Rejecting incoming connection request from the"		Log.d(TAG, "Rejecting incoming connection request from the"
	+ " controller, controller=" + caller + ", uid=" + uid);		+ " controller=" + controllerInfo);
	}		}
	// Note: Trusted controllers also can be rejected according to the		// Note: Trusted controllers also can be rejected according to the
	// service implementation.		// service implementation.