From b0276e829fc46ff44c5578f578fcd93e92de28d0 Mon Sep 17 00:00:00 2001
From: yueg <yueg@google.com>
Date: Mon, 13 Nov 2017 12:52:48 -0800
Subject: Use TextUtils.isEmpty() instead of null check.

If phoneNumber is empty string, we go to endless loop.

Test: ContactDisplayUtilsTest
PiperOrigin-RevId: 175573954
Change-Id: I449c851c65912de5d666efe27a41ffc37a52e5ff
---
 java/com/android/contacts/common/util/ContactDisplayUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/com/android/contacts/common/util/ContactDisplayUtils.java b/java/com/android/contacts/common/util/ContactDisplayUtils.java
index ff22f2880..a45394f50 100644
--- a/java/com/android/contacts/common/util/ContactDisplayUtils.java
+++ b/java/com/android/contacts/common/util/ContactDisplayUtils.java
@@ -216,7 +216,7 @@ public class ContactDisplayUtils {
       return null;
     }
     final Spannable spannable = new SpannableString(message);
-    int start = phoneNumber == null ? -1 : message.indexOf(phoneNumber);
+    int start = TextUtils.isEmpty(phoneNumber) ? -1 : message.indexOf(phoneNumber);
     while (start >= 0) {
       final int end = start + phoneNumber.length();
       final TtsSpan ttsSpan = PhoneNumberUtilsCompat.createTtsSpan(phoneNumber);
-- 
cgit v1.2.3