Update AOSP Dialer source from internal google3 repository at

cl/152373142.

Test: make, treehugger

This CL updates the AOSP Dialer source with all the changes that have
gone into the private google3 repository. This includes all the
changes from cl/151342913 (3/27/2017) to cl/152373142 (4/06/2017).

This goal of these drops is to keep the AOSP source in sync with the
internal google3 repository. Currently these sync are done by hand
with very minor modifications to the internal source code.
See the Android.mk file for list of modifications.
Our current goal is to do frequent drops (daily if possible) and
eventually switched to an automated process.

Change-Id: I2fbc88cf6867b90ac8b65f75e5e34468988c7217

1 files changed, 7 insertions, 19 deletions

diff --git a/java/com/android/dialer/app/SpecialCharSequenceMgr.java b/java/com/android/dialer/app/SpecialCharSequenceMgr.java
index 712659c12..85c2ea650 100644
--- a/java/com/android/dialer/app/SpecialCharSequenceMgr.java
+++ b/java/com/android/dialer/app/SpecialCharSequenceMgr.java
@@ -30,7 +30,6 @@ import android.database.Cursor;
 import android.net.Uri;
 import android.provider.Settings;
 import android.support.annotation.Nullable;
-import android.support.v4.os.BuildCompat;
 import android.telecom.PhoneAccount;
 import android.telecom.PhoneAccountHandle;
 import android.telephony.PhoneNumberUtils;
@@ -71,7 +70,6 @@ public class SpecialCharSequenceMgr {
 
   private static final String TAG_SELECT_ACCT_FRAGMENT = "tag_select_acct_fragment";
 
-  private static final String SECRET_CODE_ACTION = "android.provider.Telephony.SECRET_CODE";
   private static final String MMI_IMEI_DISPLAY = "*#06#";
   private static final String MMI_REGULATORY_INFO_DISPLAY = "*#07#";
   /** ***** This code is used to handle SIM Contact queries ***** */
@@ -133,31 +131,21 @@ public class SpecialCharSequenceMgr {
 
   /**
    * Handles secret codes to launch arbitrary activities in the form of *#*#<code>#*#*.
-   * If a secret code is encountered, an Intent is started with the android_secret_code://<code>
-   * URI.
    *
    * @param context the context to use
    * @param input the text to check for a secret code in
-   * @return true if a secret code was encountered and intent is sent out
+   * @return true if a secret code was encountered and handled
    */
   static boolean handleSecretCode(Context context, String input) {
-    // Must use system service on O+ to avoid using broadcasts, which are not allowed on O+.
-    if (BuildCompat.isAtLeastO()) {
-      return context.getSystemService(TelephonyManager.class).sendDialerCode(input);
-    }
+    // Secret codes are accessed by dialing *#*#<code>#*#*
 
-    // System service call is not supported pre-O, so must use a broadcast for N-.
-    // Secret codes are in the form *#*#<code>#*#*
     int len = input.length();
-    if (len > 8 && input.startsWith("*#*#") && input.endsWith("#*#*")) {
-      final Intent intent =
-          new Intent(
-              SECRET_CODE_ACTION,
-              Uri.parse("android_secret_code://" + input.substring(4, len - 4)));
-      context.sendBroadcast(intent);
-      return true;
+    if (len <= 8 || !input.startsWith("*#*#") || !input.endsWith("#*#*")) {
+      return false;
     }
-    return false;
+    String secretCode = input.substring(4, len - 4);
+    TelephonyManagerCompat.handleSecretCode(context, secretCode);
+    return true;
   }
 
   /**