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

Commit 3717d5fe authored by Hall Liu's avatar Hall Liu Committed by Android (Google) Code Review
Browse files

Merge "Rename setMobileDataPolicyEnabledStatus" into sc-dev

parents e14dc177 68931a69

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

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ public class DataDuringCallsPreferenceController extends TelephonyTogglePreferen 


    @Override

    public boolean setChecked(boolean isChecked) {

        mManager.setMobileDataPolicyEnabledStatus(

        mManager.setMobileDataPolicyEnabled(

                TelephonyManager.MOBILE_DATA_POLICY_DATA_ON_NON_DEFAULT_DURING_VOICE_CALL,

                isChecked);

        return true;

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

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


    @Override

    public boolean setChecked(boolean isChecked) {

        mTelephonyManager.setMobileDataPolicyEnabledStatus(

        mTelephonyManager.setMobileDataPolicyEnabled(

                TelephonyManager.MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED, isChecked);

        return isChecked == mTelephonyManager.isMobileDataPolicyEnabled(

                TelephonyManager.MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED);

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

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

    public void setChecked_setDataIntoSubscriptionManager() {

        mController.setChecked(true);

        verify(mTelephonyManager).setMobileDataPolicyEnabledStatus(

        verify(mTelephonyManager).setMobileDataPolicyEnabled(

                TelephonyManager.MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED, true);



        mController.setChecked(false);

        verify(mTelephonyManager).setMobileDataPolicyEnabledStatus(

        verify(mTelephonyManager).setMobileDataPolicyEnabled(

                TelephonyManager.MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED, false);

    }

}