PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "address API council feedbacks for Telephony.Carriers" am: 71f9fe4dfa

Browse Source 
am: 1bf36a6a72

Change-Id: I9775826417d2df6284bf0273b48c3a9814a01cf4
This commit is contained in:
Chen Xu
2018-12-06 16:39:36 -08:00
committed by android-build-merger
parent 4036866211 1bf36a6a72
commit 62dc239377
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/network/ApnEditor.java
View File

@@ -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();

2
src/com/android/settings/network/ApnSettings.java
View File

@@ -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;