commit 50f5d8cf666045c1e16d0318919e47b12539b46f
author goneil <goneil@google.com> Wed Dec 20 00:41:52 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Dec 20 00:41:52 2017 +0000
tree ab227f1a8ab0a6bf497e003c5e7e1c34702b308a
parent 5855abd50549770f8f0918cbaba53aa56e5f5916
parent 1b0c8335e3839f3b7c423609c04bcfd8eace9905

Merge "Set EDITED column to USER_EDITED when editing APN" am: 90d284cab7
am: 1b0c8335e3

Change-Id: I0b37b48e160f8fcd7b96f6515b34e1cb765d2b24

src/com/android/settings/ApnEditor.java

diff --git a/src/com/android/settings/ApnEditor.java b/src/com/android/settings/ApnEditor.java
index 50a7a77..edf241d 100644
--- a/src/com/android/settings/ApnEditor.java
+++ b/src/com/android/settings/ApnEditor.java
@@ -249,7 +249,9 @@
                     finish();
                     return;
                 }
-                mUri = getContentResolver().insert(uri, new ContentValues());
+                ContentValues contentValues = new ContentValues();
+                contentValues.put(Telephony.Carriers.EDITED, Telephony.Carriers.USER_EDITED);
+                mUri = getContentResolver().insert(uri, contentValues);
             } else {
                 mUri = ContentUris.withAppendedId(Telephony.Carriers.CONTENT_URI,
                         icicle.getInt(SAVED_POS));
@@ -464,7 +466,9 @@
         if (mUri == null && mNewApn) {
             // The URI could have been deleted when activity is paused,
             // therefore, it needs to be restored.
-            mUri = getContentResolver().insert(getIntent().getData(), new ContentValues());
+            ContentValues contentValues = new ContentValues();
+            contentValues.put(Telephony.Carriers.EDITED, Telephony.Carriers.USER_EDITED);
+            mUri = getContentResolver().insert(getIntent().getData(), contentValues);
             if (mUri == null) {
                 Log.w(TAG, "Failed to insert new telephony provider into "
                         + getIntent().getData());
@@ -1044,6 +1048,8 @@
                 callUpdate,
                 CARRIER_ENABLED_INDEX);
 
+        values.put(Telephony.Carriers.EDITED, Telephony.Carriers.USER_EDITED);
+
         if (callUpdate) {
             getContentResolver().update(mUri, values, null, null);
         } else {