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

Commit 4d2b61d4 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "[Mainline] Use the @SystemApi setAlwaysAllowMmsData in TelephonyManager... 

Merge "[Mainline] Use the @SystemApi setAlwaysAllowMmsData in TelephonyManager for mainline" am: cc9aef70 am: 30d7fd79

Change-Id: Ia279507e094b7b547ea8293465817a53cc305913
parents 798407a4 30d7fd79

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) {

        return mSubscriptionManager.setAlwaysAllowMmsData(mSubId, isChecked);

        return mTelephonyManager.setAlwaysAllowMmsData(isChecked);

    }



    @Override

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

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

    public void setChecked_setDataIntoSubscriptionManager() {

        mController.setChecked(true);

        verify(mSubscriptionManager).setAlwaysAllowMmsData(SUB_ID, true);

        verify(mTelephonyManager).setAlwaysAllowMmsData(true);



        mController.setChecked(false);

        verify(mSubscriptionManager).setAlwaysAllowMmsData(SUB_ID, false);

        verify(mTelephonyManager).setAlwaysAllowMmsData(false);

    }

}