From 83ac9efb506e935ee9d31dfd0e7dd60348453e2a Mon Sep 17 00:00:00 2001 From: linyuh Date: Fri, 25 May 2018 13:02:31 -0700 Subject: Check if ID column is null before retrieving data from the smart dial database. Bug: 79469672 Test: None. See above. PiperOrigin-RevId: 198090637 Change-Id: I5e0fedc82d9b464d3d48111530c5836e5d84197f --- java/com/android/dialer/database/DialerDatabaseHelper.java | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'java/com/android') diff --git a/java/com/android/dialer/database/DialerDatabaseHelper.java b/java/com/android/dialer/database/DialerDatabaseHelper.java index b172d7039..b61cc3958 100644 --- a/java/com/android/dialer/database/DialerDatabaseHelper.java +++ b/java/com/android/dialer/database/DialerDatabaseHelper.java @@ -966,6 +966,12 @@ public class DialerDatabaseHelper extends SQLiteOpenHelper { } /** Iterates the cursor to find top contact suggestions without duplication. */ while ((cursor.moveToNext()) && (counter < MAX_ENTRIES)) { + if (cursor.isNull(columnDataId)) { + LogUtil.i( + "DialerDatabaseHelper.getLooseMatches", + "_id column null. Row was deleted during iteration, skipping"); + continue; + } final long dataID = cursor.getLong(columnDataId); final String displayName = cursor.getString(columnDisplayNamePrimary); final String phoneNumber = cursor.getString(columnNumber); -- cgit v1.2.3