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

Commit 71f9fe4d authored by Chen Xu's avatar Chen Xu Committed by Gerrit Code Review
Browse files

Merge "address API council feedbacks for Telephony.Carriers"

parents 6db9f212 54d5a727

src/com/android/settings/network/ApnEditor.java

+2 −2
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ public class ApnEditor extends SettingsPreferenceFragment 
            Telephony.Carriers.ROAMING_PROTOCOL, // 20

            Telephony.Carriers.MVNO_TYPE,   // 21

            Telephony.Carriers.MVNO_MATCH_DATA,  // 22

            Telephony.Carriers.EDITED,   // 23

            Telephony.Carriers.EDITED_STATUS,   // 23

            Telephony.Carriers.USER_EDITABLE    //24

    };
@@ -1030,7 +1030,7 @@ public class ApnEditor extends SettingsPreferenceFragment 
                callUpdate,

                CARRIER_ENABLED_INDEX);



        values.put(Telephony.Carriers.EDITED, Telephony.Carriers.USER_EDITED);

        values.put(Telephony.Carriers.EDITED_STATUS, Telephony.Carriers.USER_EDITED);



        if (callUpdate) {

            final Uri uri = mApnData.getUri() == null ? mCarrierUri : mApnData.getUri();

src/com/android/settings/network/ApnSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ public class ApnSettings extends RestrictedSettingsFragment { 
            Telephony.Carriers.TYPE,

            Telephony.Carriers.MVNO_TYPE,

            Telephony.Carriers.MVNO_MATCH_DATA,

            Telephony.Carriers.EDITED,

            Telephony.Carriers.EDITED_STATUS,

    };



    private static final int ID_INDEX = 0;