commit 9df107499e4496b5312db76e4f2bd46f6a265b76
author Treehugger Robot <treehugger-gerrit@google.com> Sat Nov 18 03:28:29 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Nov 18 03:28:29 2017 +0000
tree f80d72ac7459f92b356221607577e0c59db15f56
parent 3155e42d67d232c6070fef2f234262631859bc6d
parent b66c1d2ff4f4e86b8b8944da1649d9a0d7488abc

Merge "Use TextUtils.isEmpty() instead of null check."

java/com/android/contacts/common/util/ContactDisplayUtils.java

diff --git a/java/com/android/contacts/common/util/ContactDisplayUtils.java b/java/com/android/contacts/common/util/ContactDisplayUtils.java
index ff22f28..a45394f 100644
--- a/java/com/android/contacts/common/util/ContactDisplayUtils.java
+++ b/java/com/android/contacts/common/util/ContactDisplayUtils.java
@@ -216,7 +216,7 @@
       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);