commit 85f7f518991c83df54b677cc9b7416f8c49c0c10
author Amit Mahajan <amitmahajan@google.com> Tue Apr 14 00:12:18 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 14 00:12:31 2015 +0000
tree 36a81a73e1c9642a8fb467fe3c90c004b5e9d9b7
parent bec8492b73c98bbfcd614ee0ae070a07f1471bb9
parent bc1edc23c036a9efd6bae9f99ca22cc44d870849

Merge "Support both user and carrier edited values." into lmp-mr1-wfc-dev

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 f47959e..aa3b0e6 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -813,11 +813,11 @@
 
         static public Cursor selectConflictingRow(SQLiteDatabase db, String table,
                                                   ContentValues row) {
-            // Conflict is possible only when numeric, mnnc, mnc (fields without any default value)
+            // Conflict is possible only when numeric, mcc, mnc (fields without any default value)
             // are set in the new row
-            if (row.containsKey(Telephony.Carriers.NUMERIC) ||
-                    row.containsKey(Telephony.Carriers.MCC) ||
-                    row.containsKey(Telephony.Carriers.MNC)) {
+            if (!row.containsKey(Telephony.Carriers.NUMERIC) ||
+                    !row.containsKey(Telephony.Carriers.MCC) ||
+                    !row.containsKey(Telephony.Carriers.MNC)) {
                 loge("dbh.selectConflictingRow: called for non-conflicting row: " + row);
                 return null;
             }
@@ -1166,6 +1166,7 @@
                         DatabaseHelper.mergeFieldsAndUpdateDb(db, CARRIERS_TABLE, oldRow, values,
                                 mergedValues, false);
                         oldRow.close();
+                        notify = true;
                     }
                 }