commit 98ad8f3c9bdd52cd50ac19d4fc5cdec38e21f2bf
author Amit Mahajan <amitmahajan@google.com> Thu Apr 30 16:30:21 2015 -0700
committer The Android Automerger <android-build@google.com> Fri May 01 12:13:09 2015 -0700
tree de6bfa7f0e450815b7d34bbc3b2d42be5a51615f
parent e9a34010d11b50a929e1a11f960bf7cf7fcdbe5a

Update db only if ContentValues obj being inserted is not empty.

This hasn't been reported on shamu yet but this should be fixed because
if the issue is seen it renders the device unusable (leads to a crash
loop).

Bug: 20701423
Change-Id: I42e8fc05b39976b0ec07c0eefcca91b60f6d3694

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 1a8fa16..37cab24 100644
--- a/src/com/android/providers/telephony/TelephonyProvider.java
+++ b/src/com/android/providers/telephony/TelephonyProvider.java
@@ -811,8 +811,14 @@
                 mergedValues.putAll(newRow);
             }
 
-            db.update(table, mergedValues, "_id=" + oldRow.getInt(oldRow.getColumnIndex("_id")),
-                    null);
+            if (mergedValues.size() > 0) {
+                try {
+                    db.update(table, mergedValues, "_id=" + oldRow.getInt(oldRow.getColumnIndex("_id")),
+                            null);
+                } catch (Exception e) {
+                    loge("mergeFieldsAndUpdateDb: Exception on db update()");
+                }
+            }
         }
 
         static public Cursor selectConflictingRow(SQLiteDatabase db, String table,