From 6200bef5a981d92c80278f399f0c7d81238b7e7e Mon Sep 17 00:00:00 2001
From: linyuh <linyuh@google.com>
Date: Mon, 5 Mar 2018 10:49:37 -0800
Subject: Disable phone number formatting for LATAM MCCs.

Bug: 73718977
Test: MotorolaUtilsTest & PhoneNumberHelperTest
PiperOrigin-RevId: 187889473
Change-Id: I00d58071ba18ddce5a09c07de9edd2d0956d6478
---
 .../android/dialer/phonenumberutil/PhoneNumberHelper.java    | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'java/com/android/dialer/phonenumberutil')

diff --git a/java/com/android/dialer/phonenumberutil/PhoneNumberHelper.java b/java/com/android/dialer/phonenumberutil/PhoneNumberHelper.java
index f5e634670..e1051951e 100644
--- a/java/com/android/dialer/phonenumberutil/PhoneNumberHelper.java
+++ b/java/com/android/dialer/phonenumberutil/PhoneNumberHelper.java
@@ -33,16 +33,15 @@ import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.compat.CompatUtils;
 import com.android.dialer.compat.telephony.TelephonyManagerCompat;
+import com.android.dialer.oem.MotorolaUtils;
 import com.android.dialer.phonenumbergeoutil.PhoneNumberGeoUtilComponent;
 import com.android.dialer.telecom.TelecomUtil;
-import com.google.common.base.Ascii;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
 public class PhoneNumberHelper {
 
-  private static final String TAG = "PhoneNumberUtil";
   private static final Set<String> LEGACY_UNKNOWN_NUMBERS =
       new HashSet<>(Arrays.asList("-1", "-2", "-3"));
 
@@ -239,14 +238,7 @@ public class PhoneNumberHelper {
       return null;
     }
 
-    // Argentina phone number formats are complex and PhoneNumberUtils doesn't format all Argentina
-    // numbers correctly.
-    // To ensure consistent user experience, we disable phone number formatting for all numbers
-    // (not just Argentinian ones) for devices with Argentinian SIMs.
-    TelephonyManager telephonyManager =
-        (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
-    if (telephonyManager != null
-        && "AR".equals(Ascii.toUpperCase(telephonyManager.getSimCountryIso()))) {
+    if (MotorolaUtils.shouldDisablePhoneNumberFormatting(context)) {
       return number;
     }
 
-- 
cgit v1.2.3