Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge "Update visibility in moveTaskToBack if nothing is resumed" into qt-dev am: e004297aa1" into qt-r1-dev

Browse Source
This commit is contained in:
Android Build Merger (Role)
2019-06-08 01:30:34 +00:00
committed by Android (Google) Code Review
parent 619946fdc4 1270123b2c
commit b8baf7fd42
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/wm/ActivityStack.java
View File

@@ -4998,6 +4998,17 @@ class ActivityStack extends ConfigurationContainer {
return true; 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(); mRootActivityContainer.resumeFocusedStacksTopActivities();
return true; return true;
} }