Merge "Don't remove starting window for visible app." into oc-dr1-dev
diff --git a/services/core/java/com/android/server/am/ActivityRecord.java b/services/core/java/com/android/server/am/ActivityRecord.java
index 68f4d0d..6a8f6d3 100644
--- a/services/core/java/com/android/server/am/ActivityRecord.java
+++ b/services/core/java/com/android/server/am/ActivityRecord.java
@@ -2184,7 +2184,7 @@
if (mStartingWindowState == STARTING_WINDOW_SHOWN && behindFullscreenActivity) {
if (DEBUG_VISIBILITY) Slog.w(TAG_VISIBILITY, "Found orphaned starting window " + this);
mStartingWindowState = STARTING_WINDOW_REMOVED;
- mWindowContainerController.removeStartingWindow();
+ mWindowContainerController.removeHiddenStartingWindow();
}
}
diff --git a/services/core/java/com/android/server/wm/AppWindowContainerController.java b/services/core/java/com/android/server/wm/AppWindowContainerController.java
index cea8ee10..86e130d 100644
--- a/services/core/java/com/android/server/wm/AppWindowContainerController.java
+++ b/services/core/java/com/android/server/wm/AppWindowContainerController.java
@@ -647,7 +647,23 @@
return mContainer.getTask().getConfiguration().orientation == snapshot.getOrientation();
}
- public void removeStartingWindow() {
+ /**
+ * Remove starting window if the app is currently hidden. It is possible the starting window is
+ * part of its app exit transition animation in which case we delay hiding the app token. The
+ * method allows for removal when window manager has set the app token to hidden.
+ */
+ public void removeHiddenStartingWindow() {
+ synchronized (mWindowMap) {
+ if (!mContainer.hidden) {
+ if (DEBUG_STARTING_WINDOW) Slog.v(TAG_WM, "Starting window app still visible."
+ + " Ignoring remove request.");
+ return;
+ }
+ removeStartingWindow();
+ }
+ }
+
+ void removeStartingWindow() {
synchronized (mWindowMap) {
if (mHandler.hasCallbacks(mRemoveStartingWindow)) {
// Already scheduled.
diff --git a/services/core/java/com/android/server/wm/AppWindowToken.java b/services/core/java/com/android/server/wm/AppWindowToken.java
index ce44dab..839ee0e 100644
--- a/services/core/java/com/android/server/wm/AppWindowToken.java
+++ b/services/core/java/com/android/server/wm/AppWindowToken.java
@@ -441,6 +441,7 @@
mChildren.get(i).mWinAnimator.hide("immediately hidden");
}
SurfaceControl.closeTransaction();
+ removeStartingWindow();
}
if (!mService.mClosingApps.contains(this) && !mService.mOpeningApps.contains(this)) {
@@ -518,6 +519,12 @@
return super.checkCompleteDeferredRemoval();
}
+ private void removeStartingWindow() {
+ if (startingData != null && getController() != null) {
+ getController().removeStartingWindow();
+ }
+ }
+
void onRemovedFromDisplay() {
if (mRemovingFromDisplay) {
return;
@@ -545,9 +552,7 @@
if (DEBUG_ADD_REMOVE || DEBUG_TOKEN_MOVEMENT) Slog.v(TAG_WM, "removeAppToken: "
+ this + " delayed=" + delayed + " Callers=" + Debug.getCallers(4));
- if (startingData != null && getController() != null) {
- getController().removeStartingWindow();
- }
+ removeStartingWindow();
// If this window was animating, then we need to ensure that the app transition notifies
// that animations have completed in WMS.handleAnimatingStoppedAndTransitionLocked(), so