RESTRICT AUTOMERGE: Revert "Wait a bit until mobile network is connected"
This reverts commit 7202446109bebdc6228a009637cb4866489c1c0e.
Reason for revert: Postponed to a later release. The cl introduces invalid #null test failure, which requires additional fixes. Pls re-submit the same CL.
Change-Id: I9bf0581801dd704959886197755681080854557f
diff --git a/tests/tests/telephony/src/android/telephony/cts/SubscriptionManagerTest.java b/tests/tests/telephony/src/android/telephony/cts/SubscriptionManagerTest.java
index 18a18d7..f544694 100644
--- a/tests/tests/telephony/src/android/telephony/cts/SubscriptionManagerTest.java
+++ b/tests/tests/telephony/src/android/telephony/cts/SubscriptionManagerTest.java
@@ -64,44 +64,10 @@
private int mSubId;
private String mPackageName;
- /**
- * Callback used in testRegisterNetworkCallback that allows caller to block on
- * {@code onAvailable}.
- */
- private static class TestNetworkCallback extends ConnectivityManager.NetworkCallback {
- private final CountDownLatch mAvailableLatch = new CountDownLatch(1);
-
- public void waitForAvailable() throws InterruptedException {
- assertTrue("Cellular network did not come up after 5 seconds",
- mAvailableLatch.await(5, TimeUnit.SECONDS));
- }
-
- @Override
- public void onAvailable(Network network) {
- mAvailableLatch.countDown();
- }
- }
-
@BeforeClass
public static void setUpClass() throws Exception {
InstrumentationRegistry.getInstrumentation().getUiAutomation()
.executeShellCommand("svc wifi disable");
-
- final TestNetworkCallback callback = new TestNetworkCallback();
- final ConnectivityManager cm = InstrumentationRegistry.getContext()
- .getSystemService(ConnectivityManager.class);
- cm.registerNetworkCallback(new NetworkRequest.Builder()
- .addTransportType(TRANSPORT_CELLULAR)
- .addCapability(NET_CAPABILITY_INTERNET)
- .build(), callback);
- try {
- // Wait to get callback for availability of internet
- callback.waitForAvailable();
- } catch (InterruptedException e) {
- fail("NetworkCallback wait was interrupted.");
- } finally {
- cm.unregisterNetworkCallback(callback);
- }
}
@AfterClass
