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

Commit b8baf7fd authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Update visibility in moveTaskToBack if nothing is resumed" into...

Merge "Merge "Update visibility in moveTaskToBack if nothing is resumed" into qt-dev am: e004297a" into qt-r1-dev
parents 619946fd 1270123b
Loading
Loading
Loading
Loading
+11 −0
Original line number Diff line number Diff line
@@ -4998,6 +4998,17 @@ class ActivityStack extends ConfigurationContainer {
            return true;
        }

        ActivityRecord topActivity = getDisplay().topRunningActivity();
        ActivityStack topStack = topActivity.getActivityStack();
        if (topStack != null && topStack != this && topActivity.isState(RESUMED)) {
            // The new top activity is already resumed, so there's a good chance that nothing will
            // get resumed below. So, update visibility now in case the transition is closed
            // prematurely.
            mRootActivityContainer.ensureVisibilityAndConfig(null /* starting */,
                    getDisplay().mDisplayId, false /* markFrozenIfConfigChanged */,
                    false /* deferResume */);
        }

        mRootActivityContainer.resumeFocusedStacksTopActivities();
        return true;
    }