commit 0441b5af9e21c7aa261e5344732278c9a023d830
author Jay Shrauner <shrauner@google.com> Mon Mar 03 23:31:59 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Mar 03 23:31:59 2014 +0000
tree 59cac975e7ef8407d45f349e1233cc8389a2072e
parent fd4cd95c78224bedac2a1efd9d6861678b1653e2
parent d5074bef78b0ae682690b04b2afefea142d9eb8f

am d5074bef: am f032eef6: am df20623c: am 13a8c8c7: am 5b8f013a: Merge "Fix NPE in deleted contact removal" into klp-dev

* commit 'd5074bef78b0ae682690b04b2afefea142d9eb8f':
  Fix NPE in deleted contact removal

src/com/android/dialer/database/DialerDatabaseHelper.java

diff --git a/src/com/android/dialer/database/DialerDatabaseHelper.java b/src/com/android/dialer/database/DialerDatabaseHelper.java
index 852b7c1..d3897c2 100644
--- a/src/com/android/dialer/database/DialerDatabaseHelper.java
+++ b/src/com/android/dialer/database/DialerDatabaseHelper.java
@@ -511,6 +511,9 @@
                 DeleteContactQuery.PROJECTION,
                 DeleteContactQuery.SELECT_UPDATED_CLAUSE,
                 new String[] {last_update_time}, null);
+        if (deletedContactCursor == null) {
+            return;
+        }
 
         db.beginTransaction();
         try {