diff options
| author | linyuh <linyuh@google.com> | 2018-05-25 13:02:31 -0700 |
|---|---|---|
| committer | Eric Erfanian <erfanian@google.com> | 2018-05-30 14:04:37 +0000 |
| commit | 83ac9efb506e935ee9d31dfd0e7dd60348453e2a (patch) | |
| tree | 9ac2d3f5eb2948fcc23e6ddb4a26dc1541409345 /java/com/android/dialer/database | |
| parent | 1cfc6ea253971f25c9e2ebabe8bde4421312e798 (diff) | |
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
Diffstat (limited to 'java/com/android/dialer/database')
| -rw-r--r-- | java/com/android/dialer/database/DialerDatabaseHelper.java | 6 |
1 files changed, 6 insertions, 0 deletions
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); |