Merge "Merge "Fix testWaitForNetworkStateUpdate." into oc-dev am: d17ebaba9a am: 55eeb2036f"

This commit is contained in:
Android Build Merger (Role)
2017-04-06 22:49:21 +00:00
committed by Android (Google) Code Review

View File

@@ -137,7 +137,7 @@ public class ActivityManagerServiceTest {
mHandler = new TestHandler(mHandlerThread.getLooper());
mInjector = new TestInjector();
mAms = new ActivityManagerService(mInjector);
mAms.mWaitForNetworkTimeoutMs = 100;
mAms.mWaitForNetworkTimeoutMs = 2000;
when(mContext.getPackageManager()).thenReturn(mPackageManager);
}