summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryueg <yueg@google.com>2017-11-13 12:52:48 -0800
committerCopybara-Service <copybara-piper@google.com>2017-11-17 18:19:49 -0800
commitb0276e829fc46ff44c5578f578fcd93e92de28d0 (patch)
treef80d72ac7459f92b356221607577e0c59db15f56
parent3155e42d67d232c6070fef2f234262631859bc6d (diff)
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
-rw-r--r--java/com/android/contacts/common/util/ContactDisplayUtils.java2
1 files changed, 1 insertions, 1 deletions
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);