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

Commit fd9d81ca authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add the finishing task as a trigger for crash." into main

parents 28a5dd8e ca4bd050

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -5613,8 +5613,8 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
     * @see AppTransition#prepareAppTransition

     * @see AppTransition#prepareAppTransition

     */

     */

    void requestTransitionAndLegacyPrepare(@WindowManager.TransitionType int transit,

    void requestTransitionAndLegacyPrepare(@WindowManager.TransitionType int transit,

            @WindowManager.TransitionFlags int flags) {

            @WindowManager.TransitionFlags int flags, @Nullable WindowContainer trigger) {

        mTransitionController.requestTransitionIfNeeded(transit, flags, null /* trigger */, this);

        mTransitionController.requestTransitionIfNeeded(transit, flags, trigger, this);

    }

    }





    void executeAppTransition() {

    void executeAppTransition() {

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -250,7 +250,7 @@ class KeyguardController { 
                // to the locked state before holding the sleep token again

                // to the locked state before holding the sleep token again

                if (!ENABLE_NEW_KEYGUARD_SHELL_TRANSITIONS) {

                if (!ENABLE_NEW_KEYGUARD_SHELL_TRANSITIONS) {

                    dc.requestTransitionAndLegacyPrepare(

                    dc.requestTransitionAndLegacyPrepare(

                            TRANSIT_TO_FRONT, TRANSIT_FLAG_KEYGUARD_APPEARING);

                            TRANSIT_TO_FRONT, TRANSIT_FLAG_KEYGUARD_APPEARING, /* trigger= */ null);

                }

                }

                dc.mWallpaperController.adjustWallpaperWindows();

                dc.mWallpaperController.adjustWallpaperWindows();

                dc.executeAppTransition();

                dc.executeAppTransition();

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -5480,7 +5480,8 @@ class Task extends TaskFragment { 
        Slog.w(TAG, "  Force finishing activity "

        Slog.w(TAG, "  Force finishing activity "

                + r.intent.getComponent().flattenToShortString());

                + r.intent.getComponent().flattenToShortString());

        Task finishedTask = r.getTask();

        Task finishedTask = r.getTask();

        mDisplayContent.requestTransitionAndLegacyPrepare(TRANSIT_CLOSE, TRANSIT_FLAG_APP_CRASHED);

        mDisplayContent.requestTransitionAndLegacyPrepare(TRANSIT_CLOSE, TRANSIT_FLAG_APP_CRASHED,

                finishedTask);

        r.finishIfPossible(reason, false /* oomAdj */);

        r.finishIfPossible(reason, false /* oomAdj */);





        // Also terminate any activities below it that aren't yet stopped, to avoid a situation

        // Also terminate any activities below it that aren't yet stopped, to avoid a situation

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -482,8 +482,9 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio 
            r.detachFromProcess();

            r.detachFromProcess();

            if (r.isVisibleRequested()) {

            if (r.isVisibleRequested()) {

                hasVisibleActivity = true;

                hasVisibleActivity = true;

                Task finishingTask = r.getTask();

                r.mDisplayContent.requestTransitionAndLegacyPrepare(TRANSIT_CLOSE,

                r.mDisplayContent.requestTransitionAndLegacyPrepare(TRANSIT_CLOSE,

                        TRANSIT_FLAG_APP_CRASHED);

                        TRANSIT_FLAG_APP_CRASHED, finishingTask);

            }

            }

            r.destroyIfPossible("handleAppCrashed");

            r.destroyIfPossible("handleAppCrashed");

        }

        }

services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -1821,7 +1821,7 @@ public class DisplayContentTests extends WindowTestsBase { 
                .setTask(nonTopVisible.getTask()).setVisible(false)

                .setTask(nonTopVisible.getTask()).setVisible(false)

                .setActivityTheme(android.R.style.Theme_Translucent).build();

                .setActivityTheme(android.R.style.Theme_Translucent).build();

        final TestTransitionPlayer player = registerTestTransitionPlayer();

        final TestTransitionPlayer player = registerTestTransitionPlayer();

        mDisplayContent.requestTransitionAndLegacyPrepare(WindowManager.TRANSIT_OPEN, 0);

        mDisplayContent.requestTransitionAndLegacyPrepare(WindowManager.TRANSIT_OPEN, 0, null);

        translucentTop.setVisibility(true);

        translucentTop.setVisibility(true);

        mDisplayContent.updateOrientation();

        mDisplayContent.updateOrientation();

        assertEquals("Non-top visible activity must be portrait",

        assertEquals("Non-top visible activity must be portrait",