Merge "Add permission check for RemoteTransition in ActivityOptions" into udc-dev (a02a2d0d) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/SafeActivityOptions.java

+13 −0

Original line number	Diff line number	Diff line
		@@ -48,6 +48,7 @@ import android.os.RemoteException;
		import android.os.UserHandle;
		import android.util.Slog;
		import android.view.RemoteAnimationAdapter;
		import android.window.RemoteTransition;
		import android.window.WindowContainerToken;

		import com.android.internal.annotations.VisibleForTesting;
		@@ -385,6 +386,18 @@ public class SafeActivityOptions {
		throw new SecurityException(msg);
		}

		// Check permission for remote transitions
		final RemoteTransition transition = options.getRemoteTransition();
		if (transition != null && supervisor.mService.checkPermission(
		CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS, callingPid, callingUid)
		!= PERMISSION_GRANTED) {
		final String msg = "Permission Denial: starting " + getIntentString(intent)
		+ " from " + callerApp + " (pid=" + callingPid
		+ ", uid=" + callingUid + ") with remoteTransition";
		Slog.w(TAG, msg);
		throw new SecurityException(msg);
		}

		// If launched from bubble is specified, then ensure that the caller is system or sysui.
		if (options.getLaunchedFromBubble() && !isSystemOrSystemUI(callingPid, callingUid)) {
		final String msg = "Permission Denial: starting " + getIntentString(intent)