diff options
author | Brandon Maxwell <maxwelb@google.com> | 2016-03-15 17:32:25 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-03-15 17:32:25 +0000 |
commit | 82f68703ec819b2d9b24766e1abd019784032824 (patch) | |
tree | 5e30459f8c866c484e586a9db28bf800d0ebb73d /src/com/android/dialer/calllog/CallLogAsyncTaskUtil.java | |
parent | 24f40ae6230427e2feac143ae9d7ce961e64e91d (diff) | |
parent | 3cd1ce6c8801c338f45dad8688e2f742f910382d (diff) |
Merge "Removing hardcoded database column name" into nyc-dev am: aae1559613
am: 3cd1ce6c88
* commit '3cd1ce6c8801c338f45dad8688e2f742f910382d':
Removing hardcoded database column name
Diffstat (limited to 'src/com/android/dialer/calllog/CallLogAsyncTaskUtil.java')
-rw-r--r-- | src/com/android/dialer/calllog/CallLogAsyncTaskUtil.java | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/com/android/dialer/calllog/CallLogAsyncTaskUtil.java b/src/com/android/dialer/calllog/CallLogAsyncTaskUtil.java index 3a60a39c2..aa19d25fe 100644 --- a/src/com/android/dialer/calllog/CallLogAsyncTaskUtil.java +++ b/src/com/android/dialer/calllog/CallLogAsyncTaskUtil.java @@ -16,6 +16,8 @@ package com.android.dialer.calllog; +import com.google.common.annotations.VisibleForTesting; + import android.content.ContentResolver; import android.content.ContentValues; import android.content.Context; @@ -30,18 +32,16 @@ import android.text.TextUtils; import android.util.Log; import com.android.contacts.common.GeoUtil; +import com.android.contacts.common.compat.CompatUtils; import com.android.contacts.common.util.PermissionsUtil; -import com.android.dialer.DialtactsActivity; import com.android.dialer.PhoneCallDetails; +import com.android.dialer.compat.CallsSdkCompat; import com.android.dialer.database.VoicemailArchiveContract; -import com.android.dialer.util.AppCompatConstants; import com.android.dialer.util.AsyncTaskExecutor; import com.android.dialer.util.AsyncTaskExecutors; import com.android.dialer.util.PhoneNumberUtil; import com.android.dialer.util.TelecomUtil; -import com.google.common.annotations.VisibleForTesting; - import java.util.ArrayList; import java.util.Arrays; @@ -94,8 +94,8 @@ public class CallLogAsyncTaskUtil { static { ArrayList<String> projectionList = new ArrayList<>(); projectionList.addAll(Arrays.asList(CALL_LOG_PROJECTION_INTERNAL)); - if (PhoneNumberDisplayUtil.canShowPostDial()) { - projectionList.add(AppCompatConstants.POST_DIAL_DIGITS); + if (CompatUtils.isNCompatible()) { + projectionList.add(CallsSdkCompat.POST_DIAL_DIGITS); } projectionList.trimToSize(); CALL_LOG_PROJECTION = projectionList.toArray(new String[projectionList.size()]); @@ -113,13 +113,13 @@ public class CallLogAsyncTaskUtil { } public interface CallLogAsyncTaskListener { - public void onDeleteCall(); - public void onDeleteVoicemail(); - public void onGetCallDetails(PhoneCallDetails[] details); + void onDeleteCall(); + void onDeleteVoicemail(); + void onGetCallDetails(PhoneCallDetails[] details); } public interface OnCallLogQueryFinishedListener { - public void onQueryFinished(boolean hasEntry); + void onQueryFinished(boolean hasEntry); } // Try to identify if a call log entry corresponds to a number which was blocked. We match by @@ -185,7 +185,7 @@ public class CallLogAsyncTaskUtil { // Read call log. final String countryIso = cursor.getString(CallDetailQuery.COUNTRY_ISO_COLUMN_INDEX); final String number = cursor.getString(CallDetailQuery.NUMBER_COLUMN_INDEX); - final String postDialDigits = PhoneNumberDisplayUtil.canShowPostDial() + final String postDialDigits = CompatUtils.isNCompatible() ? cursor.getString(CallDetailQuery.POST_DIAL_DIGITS) : ""; final int numberPresentation = cursor.getInt(CallDetailQuery.NUMBER_PRESENTATION_COLUMN_INDEX); |