Bidi wrap phone number in incoming notification.

The phone number should always be displayed LTR, regardless of
whether the language is LTR or RTL.

Bug: 18581329
Change-Id: I7f8e43f86d996625da781500e61c65abe507304e

1 files changed, 5 insertions, 1 deletions

diff --git a/InCallUI/src/com/android/incallui/StatusBarNotifier.java b/InCallUI/src/com/android/incallui/StatusBarNotifier.java
index 5eaf1080f..89192f882 100644
--- a/InCallUI/src/com/android/incallui/StatusBarNotifier.java
+++ b/InCallUI/src/com/android/incallui/StatusBarNotifier.java
@@ -31,6 +31,8 @@ import android.graphics.drawable.BitmapDrawable;
 import android.os.Handler;
 import android.os.Message;
 import android.telecom.PhoneAccount;
+import android.text.BidiFormatter;
+import android.text.TextDirectionHeuristics;
 import android.text.TextUtils;
 
 import com.android.contacts.common.util.BitmapUtil;
@@ -391,7 +393,9 @@ public class StatusBarNotifier implements InCallPresenter.InCallStateListener {
             return mContext.getResources().getString(R.string.card_title_conf_call);
         }
         if (TextUtils.isEmpty(contactInfo.name)) {
-            return contactInfo.number;
+            return TextUtils.isEmpty(contactInfo.number) ? null
+                    : BidiFormatter.getInstance().unicodeWrap(
+                            contactInfo.number.toString(), TextDirectionHeuristics.LTR);
         }
 
         return contactInfo.name;