diff options
Diffstat (limited to 'java/com/android/dialer/app/calllog/calllogcache')
-rw-r--r-- | java/com/android/dialer/app/calllog/calllogcache/CallLogCache.java | 17 | ||||
-rw-r--r-- | java/com/android/dialer/app/calllog/calllogcache/CallLogCacheLollipopMr1.java | 8 |
2 files changed, 10 insertions, 15 deletions
diff --git a/java/com/android/dialer/app/calllog/calllogcache/CallLogCache.java b/java/com/android/dialer/app/calllog/calllogcache/CallLogCache.java index 6728dfb38..2e7c9339a 100644 --- a/java/com/android/dialer/app/calllog/calllogcache/CallLogCache.java +++ b/java/com/android/dialer/app/calllog/calllogcache/CallLogCache.java @@ -17,6 +17,7 @@ package com.android.dialer.app.calllog.calllogcache; import android.content.Context; +import android.support.annotation.Nullable; import android.telecom.PhoneAccountHandle; import com.android.dialer.app.calllog.CallLogAdapter; import com.android.dialer.util.CallUtil; @@ -57,20 +58,8 @@ public abstract class CallLogCache { * Returns true if the given number is the number of the configured voicemail. To be able to * mock-out this, it is not a static method. */ - public abstract boolean isVoicemailNumber(PhoneAccountHandle accountHandle, CharSequence number); - - /** - * Returns {@code true} when the current sim supports video calls, regardless of the value in a - * contact's {@link android.provider.ContactsContract.CommonDataKinds.Phone#CARRIER_PRESENCE} - * column. - */ - public boolean isVideoEnabled() { - if (!mHasCheckedForVideoAvailability) { - mVideoAvailability = CallUtil.getVideoCallingAvailability(mContext); - mHasCheckedForVideoAvailability = true; - } - return (mVideoAvailability & CallUtil.VIDEO_CALLING_ENABLED) != 0; - } + public abstract boolean isVoicemailNumber( + PhoneAccountHandle accountHandle, @Nullable CharSequence number); /** * Returns {@code true} when the current sim supports checking video calling capabilities via the diff --git a/java/com/android/dialer/app/calllog/calllogcache/CallLogCacheLollipopMr1.java b/java/com/android/dialer/app/calllog/calllogcache/CallLogCacheLollipopMr1.java index f85680649..2424b6dbd 100644 --- a/java/com/android/dialer/app/calllog/calllogcache/CallLogCacheLollipopMr1.java +++ b/java/com/android/dialer/app/calllog/calllogcache/CallLogCacheLollipopMr1.java @@ -17,7 +17,9 @@ package com.android.dialer.app.calllog.calllogcache; import android.content.Context; +import android.support.annotation.Nullable; import android.telecom.PhoneAccountHandle; +import android.text.TextUtils; import android.util.ArrayMap; import com.android.dialer.calllogutils.PhoneAccountUtils; import com.android.dialer.telecom.TelecomUtil; @@ -50,7 +52,11 @@ class CallLogCacheLollipopMr1 extends CallLogCache { } @Override - public boolean isVoicemailNumber(PhoneAccountHandle accountHandle, CharSequence number) { + public boolean isVoicemailNumber( + PhoneAccountHandle accountHandle, @Nullable CharSequence number) { + if (TextUtils.isEmpty(number)) { + return false; + } return TelecomUtil.isVoicemailNumber(mContext, accountHandle, number.toString()); } |