commit a6a8233eb718ae327d8c5a78a9c39655243c85b3
author Jackeagle <jackeagle102@gmail.com> Sat Apr 07 10:13:11 2018 -0400
committer Jackeagle <jackeagle102@gmail.com> Sat Apr 07 10:13:11 2018 -0400
tree cf27bd929fc9af5dc0d2d232e090904e0dd682ff
parent 2d84e3636c3ac0de099b5c3f944b86e4d6f6f034
parent 81919fb8ec6036610839ad0ef59c92b2e022d29c

Merge tag 'android-8.1.0_r20' of https://android.googlesource.com/platform//packages/providers/TelephonyProvider into HEAD

Android 8.1.0 release 20

src/com/android/providers/telephony/TelephonyProvider.java

diff --git a/src/com/android/providers/telephony/TelephonyProvider.java b/src/com/android/providers/telephony/TelephonyProvider.java
index daa8c84..b785f1f 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -1504,6 +1504,19 @@
             }
 
             if (!onUpgrade) {
+                // Do not overwrite a carrier or user edit with EDITED=UNEDITED
+                if (newRow.containsKey(EDITED)) {
+                    int oldEdited = oldRow.getInt(oldRow.getColumnIndex(EDITED));
+                    int newEdited = newRow.getAsInteger(EDITED);
+                    if (newEdited == UNEDITED && (oldEdited == CARRIER_EDITED
+                                || oldEdited == CARRIER_DELETED
+                                || oldEdited == CARRIER_DELETED_BUT_PRESENT_IN_XML
+                                || oldEdited == USER_EDITED
+                                || oldEdited == USER_DELETED
+                                || oldEdited == USER_DELETED_BUT_PRESENT_IN_XML)) {
+                        newRow.remove(EDITED);
+                    }
+                }
                 mergedValues.putAll(newRow);
             }