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

Commit 44bd37c5 authored by Evan Rosky's avatar Evan Rosky Committed by android-build-merger
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
am: b8baf7fd

Change-Id: I02834473935d7d7b32f706ac48c22e80be2afff9
parents 6b6d9bc6 b8baf7fd

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

+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;

    }