From 72b301fac1f2420f770cd060a3d00dad4340287b Mon Sep 17 00:00:00 2001 From: Xia Wang Date: Mon, 5 Apr 2010 19:59:26 -0700 Subject: [PATCH] Fix bug2537659 When airplane mode is disabled, Mobile connection may be bring up before connecting to a known wifi. Change-Id: I92e395aefd141c8bc4b8b2e497a71e5fd131eec2 --- .../functional/ConnectivityManagerMobileTest.java | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/functional/ConnectivityManagerMobileTest.java b/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/functional/ConnectivityManagerMobileTest.java index 7641afe42e627..ae3daad6dd43c 100644 --- a/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/functional/ConnectivityManagerMobileTest.java +++ b/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/functional/ConnectivityManagerMobileTest.java @@ -470,10 +470,7 @@ public class ConnectivityManagerMobileTest } // Prepare for state validation - NetworkInfo networkInfo = cmActivity.mCM.getNetworkInfo(ConnectivityManager.TYPE_MOBILE); - cmActivity.setStateTransitionCriteria(ConnectivityManager.TYPE_MOBILE, - networkInfo.getState(),NetworkState.DO_NOTHING,State.DISCONNECTED); - networkInfo = cmActivity.mCM.getNetworkInfo(ConnectivityManager.TYPE_WIFI); + NetworkInfo networkInfo = cmActivity.mCM.getNetworkInfo(ConnectivityManager.TYPE_WIFI); assertEquals(State.DISCONNECTED, networkInfo.getState()); cmActivity.setStateTransitionCriteria(ConnectivityManager.TYPE_WIFI, networkInfo.getState(), NetworkState.TO_CONNECTION, State.CONNECTED); @@ -482,7 +479,9 @@ public class ConnectivityManagerMobileTest cmActivity.setAirplaneMode(getInstrumentation().getContext(), false); waitForNetworkState(ConnectivityManager.TYPE_WIFI, State.CONNECTED, - STATE_TRANSITION_LONG_TIMEOUT); + STATE_TRANSITION_LONG_TIMEOUT); + waitForNetworkState(ConnectivityManager.TYPE_MOBILE, State.DISCONNECTED, + STATE_TRANSITION_LONG_TIMEOUT); // validate the state transition if (!cmActivity.validateNetworkStates(ConnectivityManager.TYPE_WIFI)) { @@ -491,12 +490,6 @@ public class ConnectivityManagerMobileTest cmActivity.getTransitionFailureReason(ConnectivityManager.TYPE_WIFI)); assertTrue(false); } - if (!cmActivity.validateNetworkStates(ConnectivityManager.TYPE_MOBILE)) { - Log.v(LOG_TAG, "Mobile state transition validation failed."); - Log.v(LOG_TAG, "reason: " + - cmActivity.getTransitionFailureReason(ConnectivityManager.TYPE_MOBILE)); - assertTrue(false); - } } // Test case 8: test wifi state change while connecting/disconnecting to/from an AP