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

Commit fd52e36d authored by Zoey Chen's avatar Zoey Chen Committed by Android (Google) Code Review
Browse files

Merge "[Settings] Revert the test for using mPhoneStateListener since the... 

Merge "[Settings] Revert the test for using mPhoneStateListener since the Robolectric test is broken" into sc-dev
parents a93cdeb9 927a1cac

src/com/android/settings/AirplaneModeEnabler.java

+14 −14
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import android.os.UserHandle; 
import android.provider.Settings;

import android.telephony.PhoneStateListener;

import android.telephony.SubscriptionInfo;

import android.telephony.TelephonyCallback;

import android.telephony.TelephonyManager;

import android.util.Log;
@@ -62,7 +61,7 @@ public class AirplaneModeEnabler extends GlobalSettingsChangeListener { 


    private TelephonyManager mTelephonyManager;

    @VisibleForTesting

    AirplaneModeTelephonyCallback mTelephonyCallback;

    PhoneStateListener mPhoneStateListener;



    public AirplaneModeEnabler(Context context, OnAirplaneModeChangedListener listener) {

        super(context, Settings.Global.AIRPLANE_MODE_ON);
@@ -72,11 +71,8 @@ public class AirplaneModeEnabler extends GlobalSettingsChangeListener { 
        mOnAirplaneModeChangedListener = listener;



        mTelephonyManager = context.getSystemService(TelephonyManager.class);

        mTelephonyCallback = new AirplaneModeTelephonyCallback();

    }



    class AirplaneModeTelephonyCallback extends TelephonyCallback implements

            TelephonyCallback.RadioPowerStateListener {

        mPhoneStateListener = new PhoneStateListener(Looper.getMainLooper()) {

            @Override

            public void onRadioPowerStateChanged(int state) {

                if (DEBUG) {
@@ -84,6 +80,7 @@ public class AirplaneModeEnabler extends GlobalSettingsChangeListener { 
                }

                onAirplaneModeChanged();

            }

        };

    }



    /**
@@ -101,14 +98,16 @@ public class AirplaneModeEnabler extends GlobalSettingsChangeListener { 
     * Start listening to the phone state change

     */

    public void start() {

        mTelephonyManager.registerTelephonyCallback(mContext.getMainExecutor(), mTelephonyCallback);

        mTelephonyManager.listen(mPhoneStateListener,

                PhoneStateListener.LISTEN_RADIO_POWER_STATE_CHANGED);

    }



    /**

     * Stop listening to the phone state change

     */

    public void stop() {

        mTelephonyManager.unregisterTelephonyCallback(mTelephonyCallback);

        mTelephonyManager.listen(mPhoneStateListener,

                PhoneStateListener.LISTEN_NONE);

    }



    private void setAirplaneModeOn(boolean enabling) {
@@ -193,3 +192,4 @@ public class AirplaneModeEnabler extends GlobalSettingsChangeListener { 
        return WirelessUtils.isAirplaneModeOn(mContext);

    }

}

tests/robotests/src/com/android/settings/AirplaneModeEnablerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ public final class AirplaneModeEnablerTest { 


        ShadowSettings.setAirplaneMode(true);



        mAirplaneModeEnabler.mTelephonyCallback.onRadioPowerStateChanged(

        mAirplaneModeEnabler.mPhoneStateListener.onRadioPowerStateChanged(

                TelephonyManager.RADIO_POWER_OFF);



        verify(mAirplaneModeChangedListener, times(1)).onAirplaneModeChanged(true);