Revert "Fix transition between two occluding activities"
This reverts commit 791ccc00aae7647d146646e4c8ec0d5e2f5bd4ed.
bug 65168260
Change-Id: Ib4bb2c694a7dc6c2359143b07edecaf894a2daee
diff --git a/services/core/java/com/android/server/wm/AppWindowContainerController.java b/services/core/java/com/android/server/wm/AppWindowContainerController.java
index ebd82e3..f142ff6 100644
--- a/services/core/java/com/android/server/wm/AppWindowContainerController.java
+++ b/services/core/java/com/android/server/wm/AppWindowContainerController.java
@@ -321,8 +321,7 @@
}
}
- public void setVisibility(boolean visible, boolean visibleIgnoringKeyguard,
- boolean deferHidingClient) {
+ public void setVisibility(boolean visible, boolean deferHidingClient) {
synchronized(mWindowMap) {
if (mContainer == null) {
Slog.w(TAG_WM, "Attempted to set visibility of non-existing app token: "
@@ -361,16 +360,13 @@
wtoken.hiddenRequested = !visible;
wtoken.mDeferHidingClient = deferHidingClient;
- if (!visibleIgnoringKeyguard) {
- mService.mUnknownAppVisibilityController.appRemovedOrHidden(wtoken);
- }
-
if (!visible) {
// If the app is dead while it was visible, we kept its dead window on screen.
// Now that the app is going invisible, we can remove it. It will be restarted
// if made visible again.
wtoken.removeDeadWindows();
wtoken.setVisibleBeforeClientHidden();
+ mService.mUnknownAppVisibilityController.appRemovedOrHidden(wtoken);
} else {
if (!mService.mAppTransition.isTransitionSet()
&& mService.mAppTransition.isReady()) {