commit 5501eb381c44adab10e7fc0b1429f966307ca081
author Evan Laird <evanlaird@google.com> Wed May 25 22:39:12 2022 +0000
committer Evan Laird <evanlaird@google.com> Wed May 25 22:45:55 2022 +0000
tree 13578b2234d4cf52c06a17335774c2e384b6512c
parent 3b94f1cc61a59b1345ea652b5f324b6af0684d0d

Add cleanup to the @After method in StatusBarManagerTest

`togglePanels` helpfully toggles the state of the panel, so calling it
only once during the test means that it's never collapsed by the end of
the tests. This change adds a few cleanup methods to @After.

I found that the cleanup only works when pausing ~100ms, which is an
unfortunate reality that we should find a way around, but for now this
keeps the tests hermetic.

Test: manual; `atest StatusBarManagerTest` and check the phone to make
sure the panel is fully collapsed
Bug: 229623669

Change-Id: I82c38d0cf1872ee11a01f19f3130cc826615867d

tests/app/src/android/app/cts/StatusBarManagerTest.java

diff --git a/tests/app/src/android/app/cts/StatusBarManagerTest.java b/tests/app/src/android/app/cts/StatusBarManagerTest.java
index 3557ac1..1422ecc 100644
--- a/tests/app/src/android/app/cts/StatusBarManagerTest.java
+++ b/tests/app/src/android/app/cts/StatusBarManagerTest.java
@@ -69,13 +69,22 @@
     }
 
     @After
-    public void tearDown() {
+    public void tearDown() throws Exception {
 
         if (mStatusBarManager != null) {
             // Adopt again since tests could've dropped it
             mUiAutomation.adoptShellPermissionIdentity(PERMISSION_STATUS_BAR);
+
+            // Give the UI thread a chance to finish any animations that happened during the test,
+            // otherwise it seems to just drop these calls
+            // (b/233937748)
+            Thread.sleep(100);
+
+            mStatusBarManager.collapsePanels();
             mStatusBarManager.setDisabledForSetup(false);
+            mStatusBarManager.setExpansionDisabledForSimNetworkLock(false);
         }
+
         mUiAutomation.dropShellPermissionIdentity();
     }