commit e9e513a3c10c9a3926357abf63a3c05b8c6bfda8
author Sudheer Shanka <sudheersai@google.com> Mon Sep 04 18:36:03 2017 -0700
committer Sudheer Shanka <sudheersai@google.com> Mon Sep 04 18:49:35 2017 -0700
tree 3a9cd31ddd076ae41dcabe2fde572f28f65d6b23
parent 7575ca0f2ff92283cb3714128c28193d9138537f

Fix test failure in ActivityManagerProcessStateTest.

Bug: 64400666
Test: cts-tradefed run singleCommand cts-dev -m CtsAppTestCases -t \
      android.app.cts.ActivityManagerProcessStateTest

Change-Id: I4fe664110f7ff3301a990a56b00f2b246591785b

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

diff --git a/tests/app/src/android/app/cts/ActivityManagerProcessStateTest.java b/tests/app/src/android/app/cts/ActivityManagerProcessStateTest.java
index ecf01c0..7c1ed0d 100644
--- a/tests/app/src/android/app/cts/ActivityManagerProcessStateTest.java
+++ b/tests/app/src/android/app/cts/ActivityManagerProcessStateTest.java
@@ -692,7 +692,9 @@
 
             // Track the uid proc state changes from the broadcast (but not service execution)
             controller.getUidWatcher().waitFor(WatchUidRunner.CMD_IDLE, null, WAIT_TIME);
-            controller.getUidWatcher().expect(WatchUidRunner.CMD_UNCACHED, null, WAIT_TIME);
+            // There could be a transient 'cached' state here before 'uncached' if uid state
+            // changes are dispatched before receiver is started.
+            controller.getUidWatcher().waitFor(WatchUidRunner.CMD_UNCACHED, null, WAIT_TIME);
             controller.getUidWatcher().expect(WatchUidRunner.CMD_PROCSTATE, "RCVR", WAIT_TIME);
             controller.getUidWatcher().expect(WatchUidRunner.CMD_CACHED, null, WAIT_TIME);
             controller.getUidWatcher().expect(WatchUidRunner.CMD_PROCSTATE, "CEM", WAIT_TIME);