diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-03-08 02:50:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-03-08 02:50:26 +0000 |
| commit | d2186758f163f0808379cfdce56223032ed8b437 (patch) | |
| tree | 1756a87c6a845b9d81edb95c2e05ac60cbc53411 /java/com/android/incallui/CallerInfoAsyncQuery.java | |
| parent | 2de4a3e679ecdaf9a6ea767ce9be5c92472b29d0 (diff) | |
| parent | a8d677fce88d2add418cdcc868f2a00b2e2d702e (diff) | |
Merge changes I23025e9b,Ic9486b3f
* changes:
Support local emergency phone number check when there are multiple SIMs.
Add additional logging to missed call notification code path
Diffstat (limited to 'java/com/android/incallui/CallerInfoAsyncQuery.java')
| -rw-r--r-- | java/com/android/incallui/CallerInfoAsyncQuery.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/com/android/incallui/CallerInfoAsyncQuery.java b/java/com/android/incallui/CallerInfoAsyncQuery.java index 335895220..87dcc4f40 100644 --- a/java/com/android/incallui/CallerInfoAsyncQuery.java +++ b/java/com/android/incallui/CallerInfoAsyncQuery.java @@ -35,13 +35,13 @@ import android.provider.ContactsContract.Directory; import android.support.annotation.MainThread; import android.support.annotation.RequiresPermission; import android.support.annotation.WorkerThread; -import android.telephony.PhoneNumberUtils; import android.text.TextUtils; import com.android.dialer.common.cp2.DirectoryCompat; import com.android.dialer.phonenumbercache.CachedNumberLookupService; import com.android.dialer.phonenumbercache.CachedNumberLookupService.CachedContactInfo; import com.android.dialer.phonenumbercache.ContactInfoHelper; import com.android.dialer.phonenumbercache.PhoneNumberCache; +import com.android.dialer.phonenumberutil.PhoneNumberHelper; import com.android.dialer.strictmode.StrictModeUtils; import java.io.IOException; import java.io.InputStream; @@ -166,7 +166,7 @@ public class CallerInfoAsyncQuery { cw.countryIso = info.countryIso; // check to see if these are recognized numbers, and use shortcuts if we can. - if (PhoneNumberUtils.isLocalEmergencyNumber(context, info.phoneNumber)) { + if (PhoneNumberHelper.isLocalEmergencyNumber(context, info.phoneNumber)) { cw.event = EVENT_EMERGENCY_NUMBER; } else if (info.isVoiceMailNumber()) { cw.event = EVENT_VOICEMAIL_NUMBER; |