commit 344a43cf1a5b978e1efd071480cd11a07d4f2da9
author android-build-prod (mdb) <android-build-team-robot@google.com> Tue Apr 17 18:33:27 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 17 18:33:27 2018 +0000
tree cab7ee728fad207ba03a3294f33ea92486d5a669
parent 09a4b06010a777e26020d884712291f5af577883
parent a387a3215899467615ceb79f10dfaf96b341b082

Merge "Snap for 4726689 from 5c8518b598845429832d3ac5cda3b352688bfcd0 to oreo-mr1-cts-release" into oreo-mr1-cts-release

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 49c3d10..e94493b 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);
             }