From 7c579cd034d552ea8038a17cd85ef14389f0f769 Mon Sep 17 00:00:00 2001
From: Jorim Jaggi <jjaggi@google.com>
Date: Wed, 25 Mar 2020 18:42:49 +0100
Subject: [PATCH] Fix bubble transition hanging issues

- Update display info before changing visibilities such that we
can always start the transition (okToAnimate returns true)
- Make sure to executeAppTransition

Test: Open Bubble above app that has posted bubble
Bug: 151103701
Change-Id: I62e89a38d7dc061cb45b98d2c44cbc4ee009f714
---
 .../core/java/com/android/server/wm/DisplayContent.java   | 8 ++++----
 .../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 a90016afcc495..509eece6d7dee 100644
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -5628,6 +5628,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) {
@@ -5639,10 +5643,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 6e56bf4dafd77..cee9ca6fbc00d 100644
--- a/services/core/java/com/android/server/wm/RootWindowContainer.java
+++ b/services/core/java/com/android/server/wm/RootWindowContainer.java
@@ -2289,6 +2289,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)) {