Merge "Try to fix HostsideRestrictBackgroundNetworkTests flakyness." into oc-dev

am: c7e8f9091f

Change-Id: Ie9e4b5835a0297fd2d7cdb71d230f7833cd6b265
This commit is contained in:
Sudheer Shanka
2017-05-26 19:12:54 +00:00
committed by android-build-merger

View File

@@ -782,7 +782,7 @@ abstract class AbstractRestrictBackgroundNetworkTestCase extends Instrumentation
}
protected void assertAppIdle(boolean enabled) throws Exception {
assertDelayedShellCommand("am get-inactive " + TEST_APP2_PKG, 10, 2, "Idle=" + enabled);
assertDelayedShellCommand("am get-inactive " + TEST_APP2_PKG, 15, 2, "Idle=" + enabled);
}
/**
@@ -848,6 +848,8 @@ abstract class AbstractRestrictBackgroundNetworkTestCase extends Instrumentation
return;
} else if (type == TYPE_COMPONENT_ACTIVTIY) {
turnScreenOn();
// Wait for screen-on state to propagate through the system.
SystemClock.sleep(2000);
final CountDownLatch latch = new CountDownLatch(1);
final Intent launchIntent = getIntentForComponent(type);
final Bundle extras = new Bundle();