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

Commit d6ae4c1a authored by Robin Lee's avatar Robin Lee Committed by Android (Google) Code Review
Browse files

Merge "Allow VIS to override task transition animation." into main

parents 20f124b2 15320087

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

+3 −1
Original line number Diff line number Diff line
@@ -333,7 +333,9 @@ public class SafeActivityOptions { 
        if (aInfo != null && overrideTaskTransition) {

            final int startTasksFromRecentsPerm = ActivityTaskManagerService.checkPermission(

                    START_TASKS_FROM_RECENTS, callingPid, callingUid);

            if (startTasksFromRecentsPerm != PERMISSION_GRANTED) {

            // Allow if calling uid is from assistant, or start task from recents

            if (startTasksFromRecentsPerm != PERMISSION_GRANTED

                    && !isAssistant(supervisor.mService, callingUid)) {

                final String msg = "Permission Denial: starting " + getIntentString(intent)

                        + " from " + callerApp + " (pid=" + callingPid

                        + ", uid=" + callingUid + ") with overrideTaskTransition=true";