Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2875ffc0 authored by Evan Rosky's avatar Evan Rosky
Browse files

Add permission check for RemoteTransition in ActivityOptions 

This was omitted which meant that any app could provide one.

Bug: 286882367
Test: atest android.security.cts.ActivityManagerTest#testActivityManager_rejectRemoteTransition
Change-Id: Idbc966578805c9e942ff74bae4945f4b1ccbb190
parent 88bcdd1e

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)