From 28e9960de1cc2124b9fe853d7567421d3bab79dd Mon Sep 17 00:00:00 2001 From: Vishnu Nair Date: Wed, 31 Jul 2019 13:34:18 -0700 Subject: [PATCH] Fix window flags being assinged incorrectly when checking for changes Test: go/wm-smoke Test: presubmit tests Change-Id: I3d382e261dfb890fa8fbe4f3f6cc9f0cb3c99713 --- .../core/java/com/android/server/wm/WindowManagerService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index fbdc54a2435b6..191a96bc9f1eb 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -2033,7 +2033,7 @@ public class WindowManagerService extends IWindowManager.Stub attrs.height = win.mAttrs.height; } - flagChanges = win.mAttrs.flags ^= attrs.flags; + flagChanges = win.mAttrs.flags ^ attrs.flags; attrChanges = win.mAttrs.copyFrom(attrs); if ((attrChanges & (WindowManager.LayoutParams.LAYOUT_CHANGED | WindowManager.LayoutParams.SYSTEM_UI_VISIBILITY_CHANGED)) != 0) {