commit ebcbc34587e0e88ddce2158d161c6eb39b06c3dd
author chaviw <chaviw@google.com> Wed Feb 07 13:19:00 2018 -0800
committer chaviw <chaviw@google.com> Thu Feb 08 15:52:01 2018 -0800
tree 8e7544de65479166dcad404e673bc37fcd354f5c
parent 44dbca0999d1c20237383ff9a2199a21ccc4d4d4

Use the WS hidden flag instead of WSA for dim check

The current code uses the WSA mLastHidden flag to ensure that the WSA
animation starts at the same time as the dim. However, the flag is set
to true when the layer is being preserved which will cause the dim to
hide and then show again. Instead, use the WS mHidden flag which is set
to false when the WSA will be shown, but still remains false when the
WSA surface is getting preserved.

Change-Id: I8b2545480fad78cdba26173d28503fc7fe591d28
Fixes: 72869695
Test: Bug no longer occurs.
Test: Other dims still work properly
Test: atest WindowManagerSmokeTest

services/tests/servicestests/src/com/android/server/wm/WindowStateTests.java

diff --git a/services/tests/servicestests/src/com/android/server/wm/WindowStateTests.java b/services/tests/servicestests/src/com/android/server/wm/WindowStateTests.java
index 6a4710b..4d41718 100644
--- a/services/tests/servicestests/src/com/android/server/wm/WindowStateTests.java
+++ b/services/tests/servicestests/src/com/android/server/wm/WindowStateTests.java
@@ -36,6 +36,7 @@
 import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_MEDIA_OVERLAY;
 import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_SUB_PANEL;
 import static android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
@@ -57,15 +58,17 @@
         final WindowState child1 = createWindow(parentWindow, FIRST_SUB_WINDOW, "child1");
         final WindowState child2 = createWindow(parentWindow, FIRST_SUB_WINDOW, "child2");
 
-        assertFalse(parentWindow.mHidden);
+        // parentWindow is initially set to hidden.
+        assertTrue(parentWindow.mHidden);
+        assertFalse(parentWindow.isParentWindowHidden());
+        assertTrue(child1.isParentWindowHidden());
+        assertTrue(child2.isParentWindowHidden());
+
+        parentWindow.mHidden = false;
         assertFalse(parentWindow.isParentWindowHidden());
         assertFalse(child1.isParentWindowHidden());
         assertFalse(child2.isParentWindowHidden());
 
-        parentWindow.mHidden = true;
-        assertFalse(parentWindow.isParentWindowHidden());
-        assertTrue(child1.isParentWindowHidden());
-        assertTrue(child2.isParentWindowHidden());
     }
 
     @Test