diff options
| author | linyuh <linyuh@google.com> | 2018-03-23 01:09:53 -0700 |
|---|---|---|
| committer | Copybara-Service <copybara-piper@google.com> | 2018-03-26 22:17:26 -0700 |
| commit | 509a80d3ec56da2bc1c1cf1d438623f6ccad1654 (patch) | |
| tree | 2d83ef87aaeb7d561e4bf1ef3c7707e94bdbd25a /java/com/android/dialer/app | |
| parent | 74831c35e09344ef700efbdac4ec14d6590be40f (diff) | |
Fix CallLogGroupBuilderTest after min SDK was bumped up to N.
Bug: 76154272
Test: CallLogGroupBuilderTest
PiperOrigin-RevId: 190187854
Change-Id: Ib96c406c4bb0627729c24c58c526850ff4fda22f
Diffstat (limited to 'java/com/android/dialer/app')
| -rw-r--r-- | java/com/android/dialer/app/calllog/CallLogGroupBuilder.java | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/java/com/android/dialer/app/calllog/CallLogGroupBuilder.java b/java/com/android/dialer/app/calllog/CallLogGroupBuilder.java index 4a0d78d57..e4bae5e5f 100644 --- a/java/com/android/dialer/app/calllog/CallLogGroupBuilder.java +++ b/java/com/android/dialer/app/calllog/CallLogGroupBuilder.java @@ -17,8 +17,6 @@ package com.android.dialer.app.calllog; import android.database.Cursor; -import android.os.Build.VERSION; -import android.os.Build.VERSION_CODES; import android.support.annotation.Nullable; import android.support.annotation.VisibleForTesting; import android.telephony.PhoneNumberUtils; @@ -104,10 +102,8 @@ public class CallLogGroupBuilder { // Instantiate other group values to those of the first call in the cursor. String groupAccountId = cursor.getString(CallLogQuery.ACCOUNT_ID); - String groupPostDialDigits = - (VERSION.SDK_INT >= VERSION_CODES.N) ? cursor.getString(CallLogQuery.POST_DIAL_DIGITS) : ""; - String groupViaNumbers = - (VERSION.SDK_INT >= VERSION_CODES.N) ? cursor.getString(CallLogQuery.VIA_NUMBER) : ""; + String groupPostDialDigits = cursor.getString(CallLogQuery.POST_DIAL_DIGITS); + String groupViaNumbers = cursor.getString(CallLogQuery.VIA_NUMBER); int groupCallType = cursor.getInt(CallLogQuery.CALL_TYPE); int groupSize = 1; @@ -123,12 +119,8 @@ public class CallLogGroupBuilder { while (cursor.moveToNext()) { // Obtain the values for the current call to group. number = cursor.getString(CallLogQuery.NUMBER); - numberPostDialDigits = - (VERSION.SDK_INT >= VERSION_CODES.N) - ? cursor.getString(CallLogQuery.POST_DIAL_DIGITS) - : ""; - numberViaNumbers = - (VERSION.SDK_INT >= VERSION_CODES.N) ? cursor.getString(CallLogQuery.VIA_NUMBER) : ""; + numberPostDialDigits = cursor.getString(CallLogQuery.POST_DIAL_DIGITS); + numberViaNumbers = cursor.getString(CallLogQuery.VIA_NUMBER); callType = cursor.getInt(CallLogQuery.CALL_TYPE); callFeatures = cursor.getInt(CallLogQuery.FEATURES); accountComponentName = cursor.getString(CallLogQuery.ACCOUNT_COMPONENT_NAME); |