commit b5bc3af3faf1af9868f4c7c69c4539b46f5e1ce1
author qianyou <qianyou@xiaomi.com> Fri May 29 17:36:16 2020 +0800
committer Jaewan Kim <jaewan@google.com> Tue Jun 30 01:37:09 2020 +0900
tree 3353c0d800a85944371dd36894968726b2534ec8
parent 00c7d9942ab53e5c5f4c1959644ee7916a301064

fix removeUser failure due to slow broadcast processing

Removing the secondary user may not finish within the timeout of executeShellCommand() on low-end devices. It's because USER_STOPPING and/or ACTION_SHUTDOWN broadcasts aren't completed due to the other broadcast requests.

This CL fixes the issue by waiting for broadcast idle before removing user.

Bug:157813754
Test: run cts -m CtsMediaHostTestCases

Signed-off-by: qianyou <qianyou@xiaomi.com>
Change-Id: I4a9e1922e139771775a223052cc9e4a93ebe9212

hostsidetests/media/src/android/media/cts/BaseMultiUserTest.java

diff --git a/hostsidetests/media/src/android/media/cts/BaseMultiUserTest.java b/hostsidetests/media/src/android/media/cts/BaseMultiUserTest.java
index e6f8c62..08461fb 100644
--- a/hostsidetests/media/src/android/media/cts/BaseMultiUserTest.java
+++ b/hostsidetests/media/src/android/media/cts/BaseMultiUserTest.java
@@ -227,6 +227,7 @@
     protected void removeUser(int userId) throws Exception  {
         if (getDevice().listUsers().contains(userId) && userId != USER_SYSTEM
                 && !mExistingUsers.contains(userId)) {
+            getDevice().executeShellCommand("am wait-for-broadcast-idle");
             // Don't log output, as tests sometimes set no debug user restriction, which
             // causes this to fail, we should still continue and remove the user.
             String stopUserCommand = "am stop-user -w -f " + userId;