commit 99da33ca7fbee481df283e3b2d639329a7a56db6
author maxwelb <maxwelb@google.com> Mon Feb 05 13:26:46 2018 -0800
committer Copybara-Service <copybara-piper@google.com> Mon Feb 05 16:35:35 2018 -0800
tree 14431c15c8bfde092cf67c661b5169e5fa36c873
parent 2c5fce91828229d6d6800fa62ce97827f0cc7f12

Check for null column before getting contact_id

Bug: 72320869
Test: None :/. See above, I tried
PiperOrigin-RevId: 184576992
Change-Id: I2c9eb095d298043ec3d4bc514c0ffa6bd8a98241

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

diff --git a/java/com/android/dialer/database/DialerDatabaseHelper.java b/java/com/android/dialer/database/DialerDatabaseHelper.java
index cb07615..8431a90 100644
--- a/java/com/android/dialer/database/DialerDatabaseHelper.java
+++ b/java/com/android/dialer/database/DialerDatabaseHelper.java
@@ -374,7 +374,12 @@
       }
 
       do {
-        Long deleteContactId = deletedContactCursor.getLong(DeleteContactQuery.DELETED_CONTACT_ID);
+        if (deletedContactCursor.isNull(DeleteContactQuery.DELETED_CONTACT_ID)) {
+          LogUtil.i("DialerDatabaseHelper.removeDeletedContacts", "null contact id, skipping row");
+          continue;
+        }
+
+        long deleteContactId = deletedContactCursor.getLong(DeleteContactQuery.DELETED_CONTACT_ID);
 
         Selection smartDialSelection =
             Selection.column(SmartDialDbColumns.CONTACT_ID).is("=", deleteContactId);