PhoneUtils: Phone numbers are always LTR regardless of grouping

Don't reformat the output of libphonenumber when it comes out
grouped according to regional formats. Even with spaces, phone
numbers are not RTL.

Ref CYNGNOS-1171

Change-Id: I9aa0c8b697bf2db4a87e69cecac8f7059712272e

1 files changed, 5 insertions, 1 deletions

diff --git a/src/com/android/messaging/util/PhoneUtils.java b/src/com/android/messaging/util/PhoneUtils.java
index 0fa1f90..cd89551 100644
--- a/src/com/android/messaging/util/PhoneUtils.java
+++ b/src/com/android/messaging/util/PhoneUtils.java
@@ -27,6 +27,8 @@ import android.net.ConnectivityManager;
 import android.provider.Settings;
 import android.provider.Telephony;
 import android.support.v4.util.ArrayMap;
+import android.support.v4.text.BidiFormatter;
+import android.support.v4.text.TextDirectionHeuristicsCompat;
 import android.telephony.PhoneNumberUtils;
 import android.telephony.SmsManager;
 import android.telephony.SubscriptionInfo;
@@ -876,7 +878,9 @@ public abstract class PhoneUtils {
             final PhoneNumberFormat phoneNumberFormat =
                     (systemCountryCode > 0 && parsedNumber.getCountryCode() == systemCountryCode) ?
                             PhoneNumberFormat.NATIONAL : PhoneNumberFormat.INTERNATIONAL;
-            return phoneNumberUtil.format(parsedNumber, phoneNumberFormat);
+            return BidiFormatter.getInstance().unicodeWrap(
+                    phoneNumberUtil.format(parsedNumber, phoneNumberFormat),
+                    TextDirectionHeuristicsCompat.LTR);
         } catch (NumberParseException e) {
             LogUtil.e(TAG, "PhoneUtils.formatForDisplay: invalid phone number "
                     + LogUtil.sanitizePII(phoneText) + " with country " + systemCountry);