From 267cdad8f95c541d421292a5675a2e13f81850e0 Mon Sep 17 00:00:00 2001
From: yueg <yueg@google.com>
Date: Tue, 8 May 2018 12:09:45 -0700
Subject: Format callback phone number.

Test: manual
PiperOrigin-RevId: 195856176
Change-Id: I8579afff48e9c07d422505b81d703adc03656435
---
 java/com/android/incallui/contactgrid/ContactGridManager.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/java/com/android/incallui/contactgrid/ContactGridManager.java b/java/com/android/incallui/contactgrid/ContactGridManager.java
index d8b1f5004..493f2d583 100644
--- a/java/com/android/incallui/contactgrid/ContactGridManager.java
+++ b/java/com/android/incallui/contactgrid/ContactGridManager.java
@@ -23,6 +23,8 @@ import android.os.SystemClock;
 import android.support.annotation.Nullable;
 import android.support.v4.view.ViewCompat;
 import android.telephony.PhoneNumberUtils;
+import android.text.BidiFormatter;
+import android.text.TextDirectionHeuristics;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.accessibility.AccessibilityEvent;
@@ -416,7 +418,9 @@ public class ContactGridManager {
     // This is used for carriers like Project Fi to show the callback number for emergency calls.
     deviceNumberTextView.setText(
         context.getString(
-            R.string.contact_grid_callback_number, primaryCallState.callbackNumber()));
+            R.string.contact_grid_callback_number,
+            BidiFormatter.getInstance()
+                .unicodeWrap(primaryCallState.callbackNumber(), TextDirectionHeuristics.LTR)));
     deviceNumberTextView.setVisibility(View.VISIBLE);
     if (primaryInfo.shouldShowLocation()) {
       deviceNumberDivider.setVisibility(View.VISIBLE);
-- 
cgit v1.2.3