Merge "MediaSessionManager: Apply API council review" into pi-dev (628f59aa) · Commits · e / os / android_frameworks_base

media/java/android/media/session/MediaSessionManager.java

+12 −2

Original line number	Diff line number	Diff line
		@@ -47,6 +47,7 @@ import android.view.KeyEvent;
		import java.util.ArrayList;
		import java.util.Collections;
		import java.util.List;
		import java.util.Objects;
		import java.util.concurrent.Executor;

		/**
		@@ -342,12 +343,16 @@ public final class MediaSessionManager {
		}

		/**
		* Returns whether the app is trusted.
		* Checks whether the remote user is a trusted app.
		* <p>
		* An app is trusted if the app holds the android.Manifest.permission.MEDIA_CONTENT_CONTROL
		* permission or has an enabled notification listener.
		*
		* @param userInfo The remote user info
		* @param userInfo The remote user info from either
		* {@link MediaSession#getCurrentControllerInfo()} or
		* {@link MediaBrowserService#getCurrentBrowserInfo()}.
		* @return {@code true} if the remote user is trusted and its package name matches with the UID.
		* {@code false} otherwise.
		*/
		public boolean isTrustedForMediaControl(RemoteUserInfo userInfo) {
		if (userInfo.getPackageName() == null) {
		@@ -814,6 +819,11 @@ public final class MediaSessionManager {
		&& mPid == otherUserInfo.mPid
		&& mUid == otherUserInfo.mUid;
		}

		@Override
		public int hashCode() {
		return Objects.hash(mPackageName, mPid, mUid);
		}
		}

		private static final class SessionsChangedWrapper {

+18 −0

Original line number	Diff line number	Diff line
		@@ -1515,6 +1515,24 @@ public class MediaSessionService extends SystemService implements Monitor {
		final int uid = Binder.getCallingUid();
		final long token = Binder.clearCallingIdentity();
		try {
		int controllerUserId = UserHandle.getUserId(controllerUid);
		int controllerUidFromPackageName;
		try {
		controllerUidFromPackageName = getContext().getPackageManager()
		.getPackageUidAsUser(controllerPackageName, controllerUserId);
		} catch (NameNotFoundException e) {
		if (DEBUG) {
		Log.d(TAG, "Package " + controllerPackageName + " doesn't exist");
		}
		return false;
		}
		if (controllerUidFromPackageName != controllerUid) {
		if (DEBUG) {
		Log.d(TAG, "Package name " + controllerPackageName
		+ " doesn't match with the uid " + controllerUid);
		}
		return false;
		}
		return hasMediaControlPermission(UserHandle.getUserId(uid), controllerPackageName,
		controllerPid, controllerUid);
		} finally {