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

Commit 7a77f798 authored by Bryan Ferris's avatar Bryan Ferris Committed by Android (Google) Code Review
Browse files

Merge "[RESTRICT AUTOMERGE] Restrict app transition maximum duration" into pi-dev

parents 246360bf ee11625b

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

+1 −0
Original line number Diff line number Diff line
@@ -161,6 +161,7 @@ public class AppTransition implements Dump { 
    private static final int MAX_CLIP_REVEAL_TRANSITION_DURATION = 420;

    private static final int THUMBNAIL_APP_TRANSITION_DURATION = 336;

    private static final long APP_TRANSITION_TIMEOUT_MS = 5000;

    static final int MAX_APP_TRANSITION_DURATION = 3 * 1000; // 3 secs.



    private final Context mContext;

    private final WindowManagerService mService;

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

+10 −1
Original line number Diff line number Diff line
@@ -1843,7 +1843,16 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree 
                displayConfig.uiMode, displayConfig.orientation, frame, displayFrame, insets,

                surfaceInsets, stableInsets, isVoiceInteraction, freeform, getTask().mTaskId);

        if (a != null) {

            if (DEBUG_ANIM) logWithStack(TAG, "Loaded animation " + a + " for " + this);

            if (a != null) {

                // Setup the maximum app transition duration to prevent malicious app may set a long

                // animation duration or infinite repeat counts for the app transition through

                // ActivityOption#makeCustomAnimation or WindowManager#overridePendingTransition.

                a.restrictDuration(MAX_APP_TRANSITION_DURATION);

            }

            if (DEBUG_ANIM) {

                logWithStack(TAG, "Loaded animation " + a + " for " + this

                        + ", duration: " + ((a != null) ? a.getDuration() : 0));

            }

            final int containingWidth = frame.width();

            final int containingHeight = frame.height();

            a.initialize(containingWidth, containingHeight, width, height);