From b0276e829fc46ff44c5578f578fcd93e92de28d0 Mon Sep 17 00:00:00 2001 From: yueg 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 From 31ddc75874e746d860d022eb57fa7f396874bd21 Mon Sep 17 00:00:00 2001 From: wangqi Date: Mon, 13 Nov 2017 14:21:02 -0800 Subject: Fix bug that RTL posistion is not correct when initializing in CallLogActivity. Bug: 69133607 Test: manual PiperOrigin-RevId: 175586518 Change-Id: Id877da9734973f067b1455c4314406f00652b480 --- java/com/android/dialer/app/calllog/CallLogActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/com/android/dialer/app/calllog/CallLogActivity.java b/java/com/android/dialer/app/calllog/CallLogActivity.java index 1bb894c59..c83d992ee 100644 --- a/java/com/android/dialer/app/calllog/CallLogActivity.java +++ b/java/com/android/dialer/app/calllog/CallLogActivity.java @@ -216,7 +216,7 @@ public class CallLogActivity extends TransactionSafeActivity @Override public Object instantiateItem(ViewGroup container, int position) { final CallLogFragment fragment = (CallLogFragment) super.instantiateItem(container, position); - if (position == TAB_INDEX_ALL) { + if (getRtlPosition(position) == TAB_INDEX_ALL) { mAllCallsFragment = fragment; } return fragment; -- cgit v1.2.3