commit 235cc5e8bccb90e10c7a38354e3c2d4c88d8600f
author fionaxu <fionaxu@google.com> Mon Mar 06 22:25:57 2017 -0800
committer fionaxu <fionaxu@google.com> Thu Mar 16 18:51:18 2017 -0700
tree 735875e6c06774a8a8fa9924969133a8a2ca39a4
parent 6322f1cb6f9d52d9f7fde13807fd24cdc3dc3773

sendDialerCode API review

address the feeback from API review:
throw exception rather than a boolean return.
handle exception from callers instead of check return boolean
move secret code detection logic from API to API callers.

Bug: 35767402
Test: Manual
Test: run cts -m CtsTelephonyTestCases -t android.telephony.cts.TelephonyManagerTest
Change-Id: Ie31f399799d4cd2413bf65a227fb000bbbe3c8aa

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index f8eaf49..4f184b5 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -2203,6 +2203,21 @@
     }
 
     /**
+     * Send the dialer code if called from the current default dialer or the caller has
+     * carrier privilege.
+     * @param inputCode The dialer code to send
+     */
+    @Override
+    public void sendDialerSpecialCode(String callingPackage, String inputCode) {
+        mAppOps.checkPackage(Binder.getCallingUid(), callingPackage);
+        String defaultDialer = TelecomManager.from(mPhone.getContext()).getDefaultDialerPackage();
+        if (!TextUtils.equals(callingPackage, defaultDialer)) {
+            enforceCarrierPrivilege(getDefaultSubscription());
+        }
+        mPhone.sendDialerSpecialCode(inputCode);
+    }
+
+    /**
      * Returns the data network type.
      * Legacy call, permission-free.
      *

src/com/android/phone/SpecialCharSequenceMgr.java

diff --git a/src/com/android/phone/SpecialCharSequenceMgr.java b/src/com/android/phone/SpecialCharSequenceMgr.java
index 2aa1043..3c02a30 100644
--- a/src/com/android/phone/SpecialCharSequenceMgr.java
+++ b/src/com/android/phone/SpecialCharSequenceMgr.java
@@ -151,8 +151,14 @@
      * @return true if a secret code was encountered and intent is sent out
      */
     static private boolean handleSecretCode(String input) {
-        Phone phone = PhoneGlobals.getPhone();
-        return phone.sendDialerCode(input);
+        // Secret codes are in the form *#*#<code>#*#*
+        int len = input.length();
+        if (len > 8 && input.startsWith("*#*#") && input.endsWith("#*#*")) {
+            final Phone phone = PhoneGlobals.getPhone();
+            phone.sendDialerSpecialCode(input.substring(4, len - 4));
+            return true;
+        }
+        return false;
     }
 
     static private boolean handleAdnEntry(Context context, String input) {