diff options
| author | yueg <yueg@google.com> | 2017-11-13 12:52:48 -0800 |
|---|---|---|
| committer | Copybara-Service <copybara-piper@google.com> | 2017-11-17 17:31:40 -0800 |
| commit | b66c1d2ff4f4e86b8b8944da1649d9a0d7488abc (patch) | |
| tree | f80d72ac7459f92b356221607577e0c59db15f56 /java/com/android/contacts | |
| parent | 3155e42d67d232c6070fef2f234262631859bc6d (diff) | |
| download | android_packages_apps_Dialer-b66c1d2ff4f4e86b8b8944da1649d9a0d7488abc.tar.gz android_packages_apps_Dialer-b66c1d2ff4f4e86b8b8944da1649d9a0d7488abc.tar.bz2 android_packages_apps_Dialer-b66c1d2ff4f4e86b8b8944da1649d9a0d7488abc.zip | |
Use TextUtils.isEmpty() instead of null check.
If phoneNumber is empty string, we go to endless loop.
Test: ContactDisplayUtilsTest
PiperOrigin-RevId: 175573954
Change-Id: If266a15041134dda4b9b365bc77f31b15cf89b32
Diffstat (limited to 'java/com/android/contacts')
| -rw-r--r-- | java/com/android/contacts/common/util/ContactDisplayUtils.java | 2 |
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); |