Merge "System MR2: Check MODIFY_AUDIO_ROUTING permission" into sc-dev (8b40c9b3) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -5274,7 +5274,7 @@ package android.media {
		method @NonNull public java.util.List<android.media.MediaRoute2Info> getAllRoutes();
		method @Nullable public String getClientPackageName();
		method @Nullable public android.media.MediaRouter2.RoutingController getController(@NonNull String);
		method @Nullable public static android.media.MediaRouter2 getInstance(@NonNull android.content.Context, @NonNull String);
		method @Nullable @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public static android.media.MediaRouter2 getInstance(@NonNull android.content.Context, @NonNull String);
		method public void setRouteVolume(@NonNull android.media.MediaRoute2Info, int);
		method public void startScan();
		method public void stopScan();

media/java/android/media/IMediaRouterService.aidl

+1 −0

Original line number	Diff line number	Diff line
		@@ -48,6 +48,7 @@ interface IMediaRouterService {
		// MediaRouterService.java for readability.

		// Methods for MediaRouter2
		void checkModifyAudioRoutingPermission();
		List<MediaRoute2Info> getSystemRoutes();
		RoutingSessionInfo getSystemSessionInfo();

media/java/android/media/MediaRouter2.java

+13 −3

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import static com.android.internal.util.function.pooled.PooledLambda.obtainMessa
		import android.annotation.CallbackExecutor;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.RequiresPermission;
		import android.annotation.SystemApi;
		import android.annotation.TestApi;
		import android.content.Context;
		@@ -159,9 +160,11 @@ public final class MediaRouter2 {
		* Finally, it will have no effect to call {@link #setOnGetControllerHintsListener}.
		*
		* @param clientPackageName the package name of the app to control
		* @throws SecurityException if the caller doesn't have MODIFY_AUDIO_ROUTING permission.
		* @hide
		*/
		@SystemApi
		@RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING)
		@Nullable
		public static MediaRouter2 getInstance(@NonNull Context context,
		@NonNull String clientPackageName) {
		@@ -179,13 +182,20 @@ public final class MediaRouter2 {
		synchronized (sSystemRouterLock) {
		MediaRouter2 instance = sSystemMediaRouter2Map.get(clientPackageName);
		if (instance == null) {
		// TODO: Add permission check here using MODIFY_AUDIO_ROUTING.
		if (sManager == null) {
		IMediaRouterService serviceBinder = IMediaRouterService.Stub.asInterface(
		ServiceManager.getService(Context.MEDIA_ROUTER_SERVICE));
		try {
		// MediaRouterService will throw a SecurityException if the caller
		// doesn't have MODIFY_AUDIO_ROUTING permission.
		serviceBinder.checkModifyAudioRoutingPermission();
		} catch (RemoteException e) {
		e.rethrowAsRuntimeException();
		}
		sManager = MediaRouter2Manager.getInstance(context.getApplicationContext());
		}
		instance = new MediaRouter2(context, clientPackageName);
		sSystemMediaRouter2Map.put(clientPackageName, instance);
		// TODO: Remove router instance once it is not needed.
		instance.registerManagerCallbackForSystemRouter();
		}
		return instance;
		@@ -281,9 +291,9 @@ public final class MediaRouter2 {
		mDiscoveryPreference = new RouteDiscoveryPreference.Builder(
		sManager.getPreferredFeatures(clientPackageName), true).build();
		updateAllRoutesFromManager();
		mMediaRouterService = null; // TODO: Make this non-null and check permission.

		// Only used by non-system MediaRouter2.
		mMediaRouterService = null;
		mPackageName = null;
		}

services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java

+16 −0

Original line number	Diff line number	Diff line
		@@ -112,6 +112,22 @@ class MediaRouter2ServiceImpl {
		//// - Should not have @NonNull/@Nullable on any arguments
		////////////////////////////////////////////////////////////////

		@NonNull
		public void checkModifyAudioRoutingPermission() {
		final int pid = Binder.getCallingPid();
		final int uid = Binder.getCallingUid();
		final long token = Binder.clearCallingIdentity();

		try {
		if (mContext.checkPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING, pid, uid)
		!= PackageManager.PERMISSION_GRANTED) {
		throw new SecurityException("Must hold the MODIFY_AUDIO_ROUTING permission.");
		}
		} finally {
		Binder.restoreCallingIdentity(token);
		}
		}

		@NonNull
		public List<MediaRoute2Info> getSystemRoutes() {
		final int uid = Binder.getCallingUid();

services/core/java/com/android/server/media/MediaRouterService.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -436,6 +436,12 @@ public final class MediaRouterService extends IMediaRouterService.Stub
		}
		}

		// Binder call
		@Override
		public void checkModifyAudioRoutingPermission() {
		mService2.checkModifyAudioRoutingPermission();
		}

		// Binder call
		@Override
		public List<MediaRoute2Info> getSystemRoutes() {