From 9d1ef8f39daeb4cfc511b6ba47298bc27019b7d0 Mon Sep 17 00:00:00 2001 From: linyuh Date: Mon, 7 May 2018 11:33:03 -0700 Subject: Use info from EmergencyPhoneLookup to render UI for an emergency number. Bug: 71719349 Test: CallLogEntryTextTest, HistoryItemActionModulesBuilderTest PiperOrigin-RevId: 195694340 Change-Id: Ib53305c36f7ca062ef798ab3f61585d3c71adef3 --- java/com/android/dialer/calllogutils/CallLogEntryText.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'java/com/android/dialer/calllogutils') diff --git a/java/com/android/dialer/calllogutils/CallLogEntryText.java b/java/com/android/dialer/calllogutils/CallLogEntryText.java index cd8fb44d9..54b1e195a 100644 --- a/java/com/android/dialer/calllogutils/CallLogEntryText.java +++ b/java/com/android/dialer/calllogutils/CallLogEntryText.java @@ -21,7 +21,6 @@ import android.provider.CallLog.Calls; import android.text.TextUtils; import com.android.dialer.calllog.model.CoalescedRow; import com.android.dialer.duo.DuoComponent; -import com.android.dialer.phonenumberutil.PhoneNumberHelper; import com.android.dialer.time.Clock; import com.google.common.base.Optional; import com.google.common.collect.Collections2; @@ -44,7 +43,7 @@ public final class CallLogEntryText { */ public static CharSequence buildPrimaryText(Context context, CoalescedRow row) { // Calls to emergency services should be shown as "Emergency number". - if (PhoneNumberHelper.isLocalEmergencyNumber(context, row.getNumber().getNormalizedNumber())) { + if (row.getNumberAttributes().getIsEmergencyNumber()) { return context.getText(R.string.emergency_number); } @@ -110,7 +109,7 @@ public final class CallLogEntryText { public static CharSequence buildSecondaryTextForEntries( Context context, Clock clock, CoalescedRow row) { // For emergency numbers, the secondary text should contain only the timestamp. - if (PhoneNumberHelper.isLocalEmergencyNumber(context, row.getNumber().getNormalizedNumber())) { + if (row.getNumberAttributes().getIsEmergencyNumber()) { return CallLogDates.newCallLogTimestampLabel( context, clock.currentTimeMillis(), row.getTimestamp()); } @@ -168,7 +167,7 @@ public final class CallLogEntryText { */ // For emergency numbers, the secondary text should contain only the number. - if (PhoneNumberHelper.isLocalEmergencyNumber(context, row.getNumber().getNormalizedNumber())) { + if (row.getNumberAttributes().getIsEmergencyNumber()) { return !row.getFormattedNumber().isEmpty() ? row.getFormattedNumber() : row.getNumber().getNormalizedNumber(); -- cgit v1.2.3