diff options
| -rw-r--r-- | services/core/java/com/android/server/wm/DisplayContent.java | 8 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/RootWindowContainer.java | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java index 31e0b4a07075..9fc90daaccfc 100644 --- a/services/core/java/com/android/server/wm/DisplayContent.java +++ b/services/core/java/com/android/server/wm/DisplayContent.java @@ -5613,6 +5613,10 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo } 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. final int displayId = mDisplay.getDisplayId(); if (displayId != DEFAULT_DISPLAY) { @@ -5624,10 +5628,6 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo mOffToken = null; } } - - mDisplay.getRealSize(mTmpDisplaySize); - setBounds(0, 0, mTmpDisplaySize.x, mTmpDisplaySize.y); - updateDisplayInfo(); mWmService.requestTraversal(); } diff --git a/services/core/java/com/android/server/wm/RootWindowContainer.java b/services/core/java/com/android/server/wm/RootWindowContainer.java index bc5295a6fdb8..76c16d40bf2c 100644 --- a/services/core/java/com/android/server/wm/RootWindowContainer.java +++ b/services/core/java/com/android/server/wm/RootWindowContainer.java @@ -2288,6 +2288,9 @@ class RootWindowContainer extends WindowContainer<DisplayContent> TRANSIT_SHOW_SINGLE_TASK_DISPLAY, false); } stack.awakeFromSleepingLocked(); + if (display.isSingleTaskInstance()) { + display.executeAppTransition(); + } if (stack.isFocusedStackOnDisplay() && !mStackSupervisor.getKeyguardController() .isKeyguardOrAodShowing(display.mDisplayId)) { |