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

Commit c2a4d3ec authored by Hall Liu's avatar Hall Liu Committed by Gerrit Code Review
Browse files

Merge "Replace TelephonyManager methods for mobile data"

parents 21846b22 17ba8166

src/com/android/settings/network/telephony/DataDuringCallsPreferenceController.java

+5 −2
Original line number Original line Diff line number Diff line
@@ -90,12 +90,15 @@ public class DataDuringCallsPreferenceController extends TelephonyTogglePreferen 




    @Override

    @Override

    public boolean isChecked() {

    public boolean isChecked() {

        return mManager.isDataAllowedInVoiceCall();

        return mManager.isMobileDataPolicyEnabled(

                TelephonyManager.MOBILE_DATA_POLICY_DATA_ON_NON_DEFAULT_DURING_VOICE_CALL);

    }

    }





    @Override

    @Override

    public boolean setChecked(boolean isChecked) {

    public boolean setChecked(boolean isChecked) {

        mManager.setDataAllowedDuringVoiceCall(isChecked);

        mManager.setMobileDataPolicyEnabledStatus(

                TelephonyManager.MOBILE_DATA_POLICY_DATA_ON_NON_DEFAULT_DURING_VOICE_CALL,

                isChecked);

        return true;

        return true;

    }

    }

src/com/android/settings/network/telephony/MmsMessagePreferenceController.java

+4 −1
Original line number Original line Diff line number Diff line
@@ -88,7 +88,10 @@ public class MmsMessagePreferenceController extends TelephonyTogglePreferenceCon 




    @Override

    @Override

    public boolean setChecked(boolean isChecked) {

    public boolean setChecked(boolean isChecked) {

        return mTelephonyManager.setAlwaysAllowMmsData(isChecked);

        mTelephonyManager.setMobileDataPolicyEnabledStatus(

                TelephonyManager.MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED, isChecked);

        return isChecked == mTelephonyManager.isMobileDataPolicyEnabled(

                TelephonyManager.MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED);

    }

    }





    @Override

    @Override

tests/robotests/src/com/android/settings/network/telephony/MmsMessagePreferenceControllerTest.java

+4 −2
Original line number Original line Diff line number Diff line
@@ -115,9 +115,11 @@ public class MmsMessagePreferenceControllerTest { 
    @Test

    @Test

    public void setChecked_setDataIntoSubscriptionManager() {

    public void setChecked_setDataIntoSubscriptionManager() {

        mController.setChecked(true);

        mController.setChecked(true);

        verify(mTelephonyManager).setAlwaysAllowMmsData(true);

        verify(mTelephonyManager).setMobileDataPolicyEnabledStatus(

                TelephonyManager.MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED, true);





        mController.setChecked(false);

        mController.setChecked(false);

        verify(mTelephonyManager).setAlwaysAllowMmsData(false);

        verify(mTelephonyManager).setMobileDataPolicyEnabledStatus(

                TelephonyManager.MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED, false);

    }

    }

}
 
}