From 9d1ef8f39daeb4cfc511b6ba47298bc27019b7d0 Mon Sep 17 00:00:00 2001
From: linyuh <linyuh@google.com>
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
---
 .../historyitemactions/HistoryItemActionModulesBuilder.java | 13 ++++---------
 .../history_item_action_module_info.proto                   |  5 ++++-
 2 files changed, 8 insertions(+), 10 deletions(-)

(limited to 'java/com/android/dialer/historyitemactions')

diff --git a/java/com/android/dialer/historyitemactions/HistoryItemActionModulesBuilder.java b/java/com/android/dialer/historyitemactions/HistoryItemActionModulesBuilder.java
index 86bb79daf..5da56a127 100644
--- a/java/com/android/dialer/historyitemactions/HistoryItemActionModulesBuilder.java
+++ b/java/com/android/dialer/historyitemactions/HistoryItemActionModulesBuilder.java
@@ -30,7 +30,6 @@ import com.android.dialer.common.Assert;
 import com.android.dialer.duo.Duo;
 import com.android.dialer.duo.DuoComponent;
 import com.android.dialer.logging.ReportingLocation;
-import com.android.dialer.phonenumberutil.PhoneNumberHelper;
 import com.android.dialer.util.CallUtil;
 import com.android.dialer.util.UriUtils;
 import java.util.ArrayList;
@@ -140,7 +139,7 @@ public final class HistoryItemActionModulesBuilder {
    * capability, and Duo is available, add a Duo video call module.
    */
   public HistoryItemActionModulesBuilder addModuleForVideoCall() {
-    if (isEmergencyNumber()
+    if (moduleInfo.getIsEmergencyNumber()
         || moduleInfo.getIsVoicemailCall()
         || moduleInfo.getIsBlocked()
         || moduleInfo.getIsSpam()) {
@@ -192,7 +191,7 @@ public final class HistoryItemActionModulesBuilder {
   public HistoryItemActionModulesBuilder addModuleForSendingTextMessage() {
     // TODO(zachh): There are other conditions where this module should not be shown
     // (e.g., business numbers).
-    if (isEmergencyNumber()
+    if (moduleInfo.getIsEmergencyNumber()
         || moduleInfo.getIsVoicemailCall()
         || moduleInfo.getIsBlocked()
         || TextUtils.isEmpty(moduleInfo.getNormalizedNumber())) {
@@ -233,7 +232,7 @@ public final class HistoryItemActionModulesBuilder {
    * </ul>
    */
   public HistoryItemActionModulesBuilder addModuleForAddingToContacts() {
-    if (isEmergencyNumber()
+    if (moduleInfo.getIsEmergencyNumber()
         || moduleInfo.getIsVoicemailCall()
         || moduleInfo.getIsBlocked()
         || moduleInfo.getIsSpam()
@@ -281,7 +280,7 @@ public final class HistoryItemActionModulesBuilder {
    * <p>If a number is not blocked or marked as spam, add the "Block/Report spam" module.
    */
   public HistoryItemActionModulesBuilder addModuleForBlockedOrSpamNumber() {
-    if (isEmergencyNumber() || moduleInfo.getIsVoicemailCall()) {
+    if (moduleInfo.getIsEmergencyNumber() || moduleInfo.getIsVoicemailCall()) {
       return this;
     }
 
@@ -401,10 +400,6 @@ public final class HistoryItemActionModulesBuilder {
         && !UriUtils.isEncodedContactUri(Uri.parse(moduleInfo.getLookupUri()));
   }
 
-  private boolean isEmergencyNumber() {
-    return PhoneNumberHelper.isLocalEmergencyNumber(context, moduleInfo.getNormalizedNumber());
-  }
-
   /**
    * Maps the value of {@link HistoryItemActionModuleInfo#getHost()} to {@link
    * CallInitiationType.Type}, which is required by {@link CallIntentBuilder} to build a call
diff --git a/java/com/android/dialer/historyitemactions/history_item_action_module_info.proto b/java/com/android/dialer/historyitemactions/history_item_action_module_info.proto
index 99071a7cd..f7022c28c 100644
--- a/java/com/android/dialer/historyitemactions/history_item_action_module_info.proto
+++ b/java/com/android/dialer/historyitemactions/history_item_action_module_info.proto
@@ -10,7 +10,7 @@ package com.android.dialer.historyitemactions;
 import "java/com/android/dialer/logging/contact_source.proto";
 
 // Contains information needed to construct items (modules) in a bottom sheet.
-// Next ID: 16
+// Next ID: 17
 message HistoryItemActionModuleInfo {
   // The dialer-normalized version of a phone number.
   // See DialerPhoneNumber.normalized_number.
@@ -66,4 +66,7 @@ message HistoryItemActionModuleInfo {
     VOICEMAIL = 2;
   }
   optional Host host = 15;
+
+  // Whether the number is an emergency number.
+  optional bool is_emergency_number = 16;
 }
-- 
cgit v1.2.3