diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-04-18 00:30:52 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-04-18 00:30:52 +0000 |
commit | 204130ce0391e8b7f29cfc52b75f0886fe9c01bb (patch) | |
tree | 0be4306ca538a5e1febe431c509ba2f79f784983 /java | |
parent | 2d87d76e2d4cde8279d08ca78c910ff0510f8f51 (diff) | |
parent | 3782a27fa4785ce3fe3579ecb2f9dd190baec15d (diff) |
Merge "Improved handling of IS_READ in new call log."
Diffstat (limited to 'java')
3 files changed, 15 insertions, 4 deletions
diff --git a/java/com/android/dialer/calllog/ClearMissedCalls.java b/java/com/android/dialer/calllog/ClearMissedCalls.java index 78eb80294..56c8e575b 100644 --- a/java/com/android/dialer/calllog/ClearMissedCalls.java +++ b/java/com/android/dialer/calllog/ClearMissedCalls.java @@ -138,7 +138,12 @@ public final class ClearMissedCalls { Selection.Builder selectionBuilder = Selection.builder() - .and(Selection.column(Calls.IS_READ).is("=", 0)) + .and( + Selection.column(Calls.IS_READ) + .is("=", 0) + .buildUpon() + .or(Selection.column(Calls.IS_READ).is("IS NULL")) + .build()) .and(Selection.column(Calls.TYPE).is("=", Calls.MISSED_TYPE)); if (!ids.isEmpty()) { selectionBuilder.and(Selection.column(Calls._ID).in(toStrings(ids))); diff --git a/java/com/android/dialer/calllog/database/AnnotatedCallLogDatabaseHelper.java b/java/com/android/dialer/calllog/database/AnnotatedCallLogDatabaseHelper.java index 66ba8aa59..61f7debf7 100644 --- a/java/com/android/dialer/calllog/database/AnnotatedCallLogDatabaseHelper.java +++ b/java/com/android/dialer/calllog/database/AnnotatedCallLogDatabaseHelper.java @@ -63,8 +63,8 @@ public class AnnotatedCallLogDatabaseHelper extends SQLiteOpenHelper { + (AnnotatedCallLog.NUMBER_PRESENTATION + " integer, ") + (AnnotatedCallLog.DURATION + " integer, ") + (AnnotatedCallLog.DATA_USAGE + " integer, ") - + (AnnotatedCallLog.IS_READ + " integer, ") - + (AnnotatedCallLog.NEW + " integer, ") + + (AnnotatedCallLog.IS_READ + " integer not null, ") + + (AnnotatedCallLog.NEW + " integer not null, ") + (AnnotatedCallLog.GEOCODED_LOCATION + " text, ") + (AnnotatedCallLog.PHONE_ACCOUNT_COMPONENT_NAME + " text, ") + (AnnotatedCallLog.PHONE_ACCOUNT_ID + " text, ") diff --git a/java/com/android/dialer/main/impl/bottomnav/MissedCallCountObserver.java b/java/com/android/dialer/main/impl/bottomnav/MissedCallCountObserver.java index 276063474..ee7f6d006 100644 --- a/java/com/android/dialer/main/impl/bottomnav/MissedCallCountObserver.java +++ b/java/com/android/dialer/main/impl/bottomnav/MissedCallCountObserver.java @@ -62,7 +62,13 @@ public final class MissedCallCountObserver extends ContentObserver { .query( Calls.CONTENT_URI, new String[] {Calls._ID}, - Calls.IS_READ + " = ? AND " + Calls.TYPE + " = ?", + "(" + + Calls.IS_READ + + " = ? OR " + + Calls.IS_READ + + " IS NULL) AND " + + Calls.TYPE + + " = ?", new String[] {"0", Integer.toString(Calls.MISSED_TYPE)}, /* sortOrder= */ null)) { return cursor == null ? 0 : cursor.getCount(); |