commit 2737016267aa7f476e8bbd286c83627dc432f582
author Treehugger Robot <treehugger-gerrit@google.com> Tue Sep 19 00:37:32 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Sep 19 00:37:32 2017 +0000
tree 34b2e2bdfd40405187defff88722b009560c4531
parent 479382a2203d7e26b53e0d2e19f936ec6432d586
parent 339b4f3b53894325ba68bc49c7208c20f3ff09ad

Merge "Always show line1 number in emergency call."

java/com/android/incallui/call/DialerCall.java

diff --git a/java/com/android/incallui/call/DialerCall.java b/java/com/android/incallui/call/DialerCall.java
index 1a99809..9f89925 100644
--- a/java/com/android/incallui/call/DialerCall.java
+++ b/java/com/android/incallui/call/DialerCall.java
@@ -38,7 +38,6 @@
 import android.telecom.StatusHints;
 import android.telecom.TelecomManager;
 import android.telecom.VideoProfile;
-import android.telephony.PhoneNumberUtils;
 import android.text.TextUtils;
 import com.android.contacts.common.compat.CallCompat;
 import com.android.contacts.common.compat.telecom.TelecomManagerCompat;
@@ -1156,26 +1155,10 @@
       boolean showCallbackNumber = hasProperty(Details.PROPERTY_EMERGENCY_CALLBACK_MODE);
 
       if (isEmergencyCall() || showCallbackNumber) {
-        callbackNumber = getSubscriptionNumber();
-      } else {
-        StatusHints statusHints = getTelecomCall().getDetails().getStatusHints();
-        if (statusHints != null) {
-          Bundle extras = statusHints.getExtras();
-          if (extras != null) {
-            callbackNumber = extras.getString(TelecomManager.EXTRA_CALL_BACK_NUMBER);
-          }
-        }
+        callbackNumber =
+            mContext.getSystemService(TelecomManager.class).getLine1Number(getAccountHandle());
       }
 
-      String simNumber =
-          mContext.getSystemService(TelecomManager.class).getLine1Number(getAccountHandle());
-      if (!showCallbackNumber && PhoneNumberUtils.compare(callbackNumber, simNumber)) {
-        LogUtil.v(
-            "DialerCall.getCallbackNumber",
-            "numbers are the same (and callback number is not being forced to show);"
-                + " not showing the callback number");
-        callbackNumber = "";
-      }
       if (callbackNumber == null) {
         callbackNumber = "";
       }
@@ -1183,21 +1166,6 @@
     return callbackNumber;
   }
 
-  private String getSubscriptionNumber() {
-    // If it's an emergency call, and they're not populating the callback number,
-    // then try to fall back to the phone sub info (to hopefully get the SIM's
-    // number directly from the telephony layer).
-    PhoneAccountHandle accountHandle = getAccountHandle();
-    if (accountHandle != null) {
-      PhoneAccount account =
-          mContext.getSystemService(TelecomManager.class).getPhoneAccount(accountHandle);
-      if (account != null) {
-        return getNumberFromHandle(account.getSubscriptionAddress());
-      }
-    }
-    return null;
-  }
-
   @Override
   public void onVideoTechStateChanged() {
     update();