summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--services/tests/wmtests/src/com/android/server/wm/InsetsPolicyTest.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/services/tests/wmtests/src/com/android/server/wm/InsetsPolicyTest.java b/services/tests/wmtests/src/com/android/server/wm/InsetsPolicyTest.java
index 38a66a9d5486..eeec54fdc99a 100644
--- a/services/tests/wmtests/src/com/android/server/wm/InsetsPolicyTest.java
+++ b/services/tests/wmtests/src/com/android/server/wm/InsetsPolicyTest.java
@@ -411,6 +411,10 @@ public class InsetsPolicyTest extends WindowTestsBase {
app2.mAboveInsetsState.addSource(statusBarSource);
assertTrue(app2.getInsetsState().peekSource(statusBarId).isVisible());
+ // Let app2 be the focused window. Otherwise, the control target could be overwritten by
+ // DisplayPolicy#updateSystemBarAttributes unexpectedly.
+ mDisplayContent.getDisplayPolicy().focusChangedLw(null, app2);
+
app2.setRequestedVisibleTypes(0, navigationBars() | statusBars());
mDisplayContent.getInsetsPolicy().updateBarControlTarget(app2);
waitUntilWindowAnimatorIdle();