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

Commit 30f8be44 authored by wilsonshih's avatar wilsonshih Committed by Wei Sheng Shih
Browse files

[PB] Avoid resume activity while make paired activities visible. 

While make previous activities become visible with LaunchTaskBehind,
there should drive ensureActivitiesVisible after all activities have
set LaunchTaskBehind to true. Otherwise the activities might be resume
accidentally if the first activity isn't top activity.

Flag: EXEMPT bugfix
Bug: 361273875
Test: follow issue description, verify activities won't resume before
commit gesture.

Change-Id: Id9fe10f9046dca07a55479d00c7daf4ceff76c5e
parent fa07bc40

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

+5 −2
Original line number Diff line number Diff line
@@ -2002,6 +2002,7 @@ class BackNavigationController { 
        final Transition prepareOpen = migrateBackTransition && !tc.isCollecting()

                ? tc.createTransition(TRANSIT_PREPARE_BACK_NAVIGATION) : null;



        DisplayContent commonDisplay = null;

        for (int i = affects.size() - 1; i >= 0; --i) {

            final ActivityRecord activity = affects.get(i);

            if (!migrateBackTransition && !activity.isVisibleRequested()) {
@@ -2024,13 +2025,15 @@ class BackNavigationController { 
            activity.mTaskSupervisor.mStoppingActivities.remove(activity);



            if (!migrateBackTransition) {

                activity.getDisplayContent().ensureActivitiesVisible(null /* starting */,

                        true /* notifyClients */);

                commonDisplay = activity.getDisplayContent();

            } else if (activity.shouldBeVisible()) {

                activity.ensureActivityConfiguration(true /* ignoreVisibility */);

                activity.makeVisibleIfNeeded(null /* starting */, true /* notifyToClient */);

            }

        }

        if (commonDisplay != null) {

            commonDisplay.ensureActivitiesVisible(null /* starting */, true /* notifyClients */);

        }

        if (prepareOpen != null) {

            if (prepareOpen.hasChanges()) {

                tc.requestStartTransition(prepareOpen,