commit 09c442bd5fd37dfb57b1053e472faa07abb76c54
author Chen Xu <fionaxu@google.com> Fri Feb 23 02:11:15 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 23 02:11:15 2018 +0000
tree edfb56cfa19b2224a458b88c8df8472db2844267
parent 3007c46bc326912cba58af556b7dbeb0a3994da0
parent 124ca3901ee9f17b657c48c4ea8ec02da6913bae

Merge "update carrierIdProvider index with IccId"

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 c33f485..8ae3475 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -2569,9 +2569,7 @@
         SQLiteDatabase db = getWritableDatabase();
 
         try {
-            // Replace on conflict so that if same APN is present in db with edited
-            // as UNEDITED or USER/CARRIER_DELETED, it is replaced with
-            // edited USER/CARRIER_EDITED
+            // Abort on conflict of unique fields and attempt merge
             long rowID = db.insertWithOnConflict(CARRIERS_TABLE, null, values,
                     SQLiteDatabase.CONFLICT_ABORT);
             if (rowID >= 0) {