From 99da33ca7fbee481df283e3b2d639329a7a56db6 Mon Sep 17 00:00:00 2001 From: maxwelb Date: Mon, 5 Feb 2018 13:26:46 -0800 Subject: 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 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'java/com/android') diff --git a/java/com/android/dialer/database/DialerDatabaseHelper.java b/java/com/android/dialer/database/DialerDatabaseHelper.java index cb07615a5..8431a90a7 100644 --- a/java/com/android/dialer/database/DialerDatabaseHelper.java +++ b/java/com/android/dialer/database/DialerDatabaseHelper.java @@ -374,7 +374,12 @@ public class DialerDatabaseHelper extends SQLiteOpenHelper { } 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); -- cgit v1.2.3