diff options
author | linyuh <linyuh@google.com> | 2018-03-26 12:46:18 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-03-26 22:23:52 -0700 |
commit | 437ae9552cce7768068fa92663740711ee541417 (patch) | |
tree | 1ae9af42ed23c09404b87ca613247e18c3fa10d2 /java/com/android/dialer/phonenumbercache/CallLogQuery.java | |
parent | cf14ecbc3cb604804ae1f9d01e47444fcf0eedc6 (diff) |
Remove obsolete version checks and compat utilities after min SDK was bumped up to N.
Test: Existing tests
PiperOrigin-RevId: 190508397
Change-Id: Ia5f33e45af1d1cc666fec5f43efa564b2b68c193
Diffstat (limited to 'java/com/android/dialer/phonenumbercache/CallLogQuery.java')
-rw-r--r-- | java/com/android/dialer/phonenumbercache/CallLogQuery.java | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/java/com/android/dialer/phonenumbercache/CallLogQuery.java b/java/com/android/dialer/phonenumbercache/CallLogQuery.java index 2ebc302cf..488aa26e5 100644 --- a/java/com/android/dialer/phonenumbercache/CallLogQuery.java +++ b/java/com/android/dialer/phonenumbercache/CallLogQuery.java @@ -63,7 +63,7 @@ public final class CallLogQuery { @RequiresApi(VERSION_CODES.O) public static final int TRANSCRIPTION_STATE = 26; - private static final String[] PROJECTION_M = + private static final String[] PROJECTION_N = new String[] { Calls._ID, // 0 Calls.NUMBER, // 1 @@ -89,17 +89,10 @@ public final class CallLogQuery { Calls.DATA_USAGE, // 21 Calls.TRANSCRIPTION, // 22 Calls.CACHED_PHOTO_URI, // 23 + CallLog.Calls.POST_DIAL_DIGITS, // 24 + CallLog.Calls.VIA_NUMBER // 25 }; - private static final String[] PROJECTION_N; - - static { - List<String> projectionList = new ArrayList<>(Arrays.asList(PROJECTION_M)); - projectionList.add(CallLog.Calls.POST_DIAL_DIGITS); - projectionList.add(CallLog.Calls.VIA_NUMBER); - PROJECTION_N = projectionList.toArray(new String[projectionList.size()]); - } - private static final String[] PROJECTION_O; // TODO(mdooley): remove when this becomes a public api @@ -114,12 +107,6 @@ public final class CallLogQuery { @NonNull public static String[] getProjection() { - if (VERSION.SDK_INT >= VERSION_CODES.O) { - return PROJECTION_O; - } - if (VERSION.SDK_INT >= VERSION_CODES.N) { - return PROJECTION_N; - } - return PROJECTION_M; + return VERSION.SDK_INT >= VERSION_CODES.O ? PROJECTION_O : PROJECTION_N; } } |