summaryrefslogtreecommitdiffstats
path: root/java/com/android/contacts/common/util
diff options
context:
space:
mode:
authorlinyuh <linyuh@google.com>2018-03-02 01:00:28 +0000
committerandroid-build-merger <android-build-merger@google.com>2018-03-02 01:00:28 +0000
commit48af1cd7ab12f99727355d4834e74feb3e47314f (patch)
tree08960f682f7d291d234873f85fe03f034a047e68 /java/com/android/contacts/common/util
parent120b8673d5a403a25c16f01f452266dd33f4c1d7 (diff)
parent39762d3afaf924209b0db69853d2bea474648609 (diff)
downloadandroid_packages_apps_Dialer-48af1cd7ab12f99727355d4834e74feb3e47314f.tar.gz
android_packages_apps_Dialer-48af1cd7ab12f99727355d4834e74feb3e47314f.tar.bz2
android_packages_apps_Dialer-48af1cd7ab12f99727355d4834e74feb3e47314f.zip
Merge "Disable phone number formatting for devices with Argentinian SIMs." am: 8ddc801874 am: c78a419bc2
am: 39762d3afa Change-Id: I16cae6e5944e9714192b6ffa123f7be1b7a01e98
Diffstat (limited to 'java/com/android/contacts/common/util')
-rw-r--r--java/com/android/contacts/common/util/ContactDisplayUtils.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/java/com/android/contacts/common/util/ContactDisplayUtils.java b/java/com/android/contacts/common/util/ContactDisplayUtils.java
index a45394f50..7d428e102 100644
--- a/java/com/android/contacts/common/util/ContactDisplayUtils.java
+++ b/java/com/android/contacts/common/util/ContactDisplayUtils.java
@@ -21,13 +21,13 @@ import android.content.res.Resources;
import android.provider.ContactsContract.CommonDataKinds.Phone;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
+import android.telephony.PhoneNumberUtils;
import android.text.Spannable;
import android.text.SpannableString;
import android.text.TextUtils;
import android.text.style.TtsSpan;
import android.util.Patterns;
import com.android.contacts.common.R;
-import com.android.contacts.common.compat.PhoneNumberUtilsCompat;
import com.android.contacts.common.preference.ContactsPreferences;
import com.android.dialer.common.LogUtil;
import java.util.Objects;
@@ -219,7 +219,7 @@ public class ContactDisplayUtils {
int start = TextUtils.isEmpty(phoneNumber) ? -1 : message.indexOf(phoneNumber);
while (start >= 0) {
final int end = start + phoneNumber.length();
- final TtsSpan ttsSpan = PhoneNumberUtilsCompat.createTtsSpan(phoneNumber);
+ final TtsSpan ttsSpan = PhoneNumberUtils.createTtsSpan(phoneNumber);
spannable.setSpan(
ttsSpan,
start,