summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorGuang Zhu <guangzhu@google.com>2015-05-09 00:27:55 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-09 00:27:56 +0000
commit08cba16a59c442619ec952e7ce251e4038eb8322 (patch)
treee10376f29cba33e179158407152373d17edc5d9d /tests
parentf659a56c3062392d6b6020d148553ce49797eb5a (diff)
parent765e00af5b769aff89300a167f545cac2088b1f1 (diff)
downloadframeworks_base-08cba16a59c442619ec952e7ce251e4038eb8322.zip
frameworks_base-08cba16a59c442619ec952e7ce251e4038eb8322.tar.gz
frameworks_base-08cba16a59c442619ec952e7ce251e4038eb8322.tar.bz2
Merge "allow top sleeping state in app process verification" into mnc-dev
Diffstat (limited to 'tests')
-rw-r--r--tests/Compatibility/src/com/android/compatibilitytest/AppCompatibility.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/Compatibility/src/com/android/compatibilitytest/AppCompatibility.java b/tests/Compatibility/src/com/android/compatibilitytest/AppCompatibility.java
index b54f9be..1f9e636 100644
--- a/tests/Compatibility/src/com/android/compatibilitytest/AppCompatibility.java
+++ b/tests/Compatibility/src/com/android/compatibilitytest/AppCompatibility.java
@@ -208,7 +208,8 @@ public class AppCompatibility extends InstrumentationTestCase {
private boolean ensureForegroundActivity(RunningAppProcessInfo info) {
Log.d(TAG, String.format("ensureForegroundActivity: proc=%s, pid=%d, state=%d",
info.processName, info.pid, info.processState));
- return info.processState == ActivityManager.PROCESS_STATE_TOP;
+ return info.processState == ActivityManager.PROCESS_STATE_TOP
+ || info.processState == ActivityManager.PROCESS_STATE_TOP_SLEEPING;
}
/**