commit 1bf36a6a727ed4e7a86c86b988f625b21f3c31c0
author Chen Xu <fionaxu@google.com> Thu Dec 06 16:19:11 2018 -0800
committer android-build-merger <android-build-merger@google.com> Thu Dec 06 16:19:11 2018 -0800
tree 783e37779f5ac4142822278859ad4e90e67136ba
parent b084c60686b71205251e4b81c39152fef3f5bc12
parent 71f9fe4dfabfdeba17cf9233a6104e473fa31f68

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

Change-Id: I834e4f1fe9457af586a0fe7856c4ab351a4b26a3

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

diff --git a/src/com/android/settings/network/ApnEditor.java b/src/com/android/settings/network/ApnEditor.java
index 86e9f7b..0cc88b3 100644
--- a/src/com/android/settings/network/ApnEditor.java
+++ b/src/com/android/settings/network/ApnEditor.java
@@ -166,7 +166,7 @@
             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 @@
                 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

diff --git a/src/com/android/settings/network/ApnSettings.java b/src/com/android/settings/network/ApnSettings.java
index ad7f463..3b39e38 100755
--- a/src/com/android/settings/network/ApnSettings.java
+++ b/src/com/android/settings/network/ApnSettings.java
@@ -84,7 +84,7 @@
             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;