diff options
Diffstat (limited to 'java/com/android/dialer/database')
| -rw-r--r-- | java/com/android/dialer/database/CallLogQueryHandler.java | 5 | ||||
| -rw-r--r-- | java/com/android/dialer/database/DialerDatabaseHelper.java | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/java/com/android/dialer/database/CallLogQueryHandler.java b/java/com/android/dialer/database/CallLogQueryHandler.java index a18023c4b..de4329ddd 100644 --- a/java/com/android/dialer/database/CallLogQueryHandler.java +++ b/java/com/android/dialer/database/CallLogQueryHandler.java @@ -34,7 +34,6 @@ import android.provider.VoicemailContract.Status; import android.provider.VoicemailContract.Voicemails; import com.android.contacts.common.database.NoNullCursorAsyncQueryHandler; import com.android.dialer.common.LogUtil; -import com.android.dialer.compat.AppCompatConstants; import com.android.dialer.phonenumbercache.CallLogQuery; import com.android.dialer.telecom.TelecomUtil; import com.android.dialer.util.PermissionsUtil; @@ -157,7 +156,7 @@ public class CallLogQueryHandler extends NoNullCursorAsyncQueryHandler { // Always hide blocked calls. where.append("(").append(Calls.TYPE).append(" != ?)"); - selectionArgs.add(Integer.toString(AppCompatConstants.CALLS_BLOCKED_TYPE)); + selectionArgs.add(Integer.toString(Calls.BLOCKED_TYPE)); // Ignore voicemails marked as deleted where.append(" AND (").append(Voicemails.DELETED).append(" = 0)"); @@ -171,7 +170,7 @@ public class CallLogQueryHandler extends NoNullCursorAsyncQueryHandler { selectionArgs.add(Integer.toString(callType)); } else { where.append(" AND NOT "); - where.append("(" + Calls.TYPE + " = " + AppCompatConstants.CALLS_VOICEMAIL_TYPE + ")"); + where.append("(" + Calls.TYPE + " = " + Calls.VOICEMAIL_TYPE + ")"); } if (newerThan > 0) { 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); |