Added VISIBLE_FOR_USER flag for policy visibility
Modified mPolicyVisibility so its not longer a boolean but a bitwise-or
of flags to determine policy visibility. This allows separating each visibility
policy into its own flag to ensure they don't overwrite each other. When
checking visibility, it will check that all the bits are set.
To fix the issue with switching users, added a flag VISIBLE_FOR_USER.
When calling switchUser, VISIBLE_FOR_USER will get added or removed from
mPolicyVisibility bitwise variable.
Fixes: 130700429
Test: Switch user works correctly
Test: WindowStateTests
Test: WindowStateTests#testVisibilityChangeSwitchUser
Change-Id: Ic23205eb103e2b434f4e3f274696ae1606f0c474
diff --git a/services/core/java/com/android/server/wm/AppWindowToken.java b/services/core/java/com/android/server/wm/AppWindowToken.java
index 2321898..827f223 100644
--- a/services/core/java/com/android/server/wm/AppWindowToken.java
+++ b/services/core/java/com/android/server/wm/AppWindowToken.java
@@ -78,6 +78,7 @@
import static com.android.server.wm.WindowManagerService.UPDATE_FOCUS_NORMAL;
import static com.android.server.wm.WindowManagerService.UPDATE_FOCUS_WILL_PLACE_SURFACES;
import static com.android.server.wm.WindowManagerService.logWithStack;
+import static com.android.server.wm.WindowState.LEGACY_POLICY_VISIBILITY;
import static com.android.server.wm.WindowStateAnimator.STACK_CLIP_AFTER_ANIM;
import static com.android.server.wm.WindowStateAnimator.STACK_CLIP_BEFORE_ANIM;
@@ -638,8 +639,8 @@
// If we are being set visible, and the starting window is not yet displayed,
// then make sure it doesn't get displayed.
if (startingWindow != null && !startingWindow.isDrawnLw()) {
- startingWindow.mPolicyVisibility = false;
- startingWindow.mPolicyVisibilityAfterAnim = false;
+ startingWindow.clearPolicyVisibilityFlag(LEGACY_POLICY_VISIBILITY);
+ startingWindow.mLegacyPolicyVisibilityAfterAnim = false;
}
// We are becoming visible, so better freeze the screen with the windows that are
@@ -1932,7 +1933,7 @@
+ ", isAnimationSet=" + isSelfAnimating());
if (!w.isDrawnLw()) {
Slog.v(TAG, "Not displayed: s=" + winAnimator.mSurfaceController
- + " pv=" + w.mPolicyVisibility
+ + " pv=" + w.isVisibleByPolicy()
+ " mDrawState=" + winAnimator.drawStateToString()
+ " ph=" + w.isParentWindowHidden() + " th=" + hiddenRequested
+ " a=" + isSelfAnimating());