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

Merge "Fix bubble transition hanging issues" into rvc-dev

Browse Source
This commit is contained in:
Jorim Jaggi
2020-03-27 19:28:30 +00:00
committed by Android (Google) Code Review
parent 37c91d5ef5 7c579cd034
commit c6690dd46b
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/wm/DisplayContent.java
View File

@@ -5613,6 +5613,10 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
} }
void onDisplayChanged() { void onDisplayChanged() {
mDisplay.getRealSize(mTmpDisplaySize);
setBounds(0, 0, mTmpDisplaySize.x, mTmpDisplaySize.y);
updateDisplayInfo();
// The window policy is responsible for stopping activities on the default display. // The window policy is responsible for stopping activities on the default display.
final int displayId = mDisplay.getDisplayId(); final int displayId = mDisplay.getDisplayId();
if (displayId != DEFAULT_DISPLAY) { if (displayId != DEFAULT_DISPLAY) {
@@ -5624,10 +5628,6 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
mOffToken = null; mOffToken = null;
} }
} }
mDisplay.getRealSize(mTmpDisplaySize);
setBounds(0, 0, mTmpDisplaySize.x, mTmpDisplaySize.y);
updateDisplayInfo();
mWmService.requestTraversal(); mWmService.requestTraversal();
} }

3
services/core/java/com/android/server/wm/RootWindowContainer.java
View File

@@ -2288,6 +2288,9 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
TRANSIT_SHOW_SINGLE_TASK_DISPLAY, false); TRANSIT_SHOW_SINGLE_TASK_DISPLAY, false);
} }
stack.awakeFromSleepingLocked(); stack.awakeFromSleepingLocked();
if (display.isSingleTaskInstance()) {
display.executeAppTransition();
}
if (stack.isFocusedStackOnDisplay() if (stack.isFocusedStackOnDisplay()
&& !mStackSupervisor.getKeyguardController() && !mStackSupervisor.getKeyguardController()
.isKeyguardOrAodShowing(display.mDisplayId)) { .isKeyguardOrAodShowing(display.mDisplayId)) {