Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c93386ce authored by Xia Wang's avatar Xia Wang Committed by Android (Google) Code Review
Browse files

Merge " Fix bug2537659 When airplane mode is disabled, Mobile connection may... 

Merge " Fix bug2537659  When airplane mode is disabled, Mobile connection may be bring up  before connecting to a known wifi." into froyo
parents 7b70f658 72b301fa

core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/functional/ConnectivityManagerMobileTest.java

+4 −11
Original line number Diff line number Diff line
@@ -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);
@@ -483,6 +480,8 @@ public class ConnectivityManagerMobileTest 


        waitForNetworkState(ConnectivityManager.TYPE_WIFI, State.CONNECTED,

                            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