Merge "protected android.provider.Telephony.SECRET_CODE" into oc-dev
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index bc1c448..3b9de91 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -54,6 +54,7 @@
<protected-broadcast android:name="android.provider.Telephony.WAP_PUSH_RECEIVED" />
<protected-broadcast android:name="android.provider.Telephony.SMS_CB_RECEIVED" />
<protected-broadcast android:name="android.provider.Telephony.SMS_EMERGENCY_CB_RECEIVED" />
+ <protected-broadcast android:name="android.provider.Telephony.SECRET_CODE" />
<protected-broadcast android:name= "android.intent.action.stk.command" />
<protected-broadcast android:name= "android.intent.action.stk.session_end" />
<protected-broadcast android:name= "android.intent.action.stk.icc_status_change" />
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 8ac8764..3638877 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -2188,30 +2188,6 @@
}
/**
- * Send the dialer code if called from the current default dialer and the input code follows the
- * format of *#*#<code>#*#*
- * <p>
- * Requires Permission:
- * {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE}
- *
- * @param inputCode The dialer code to send
- * @return true if successfully sent, false otherwise
- */
- @Override
- public boolean sendDialerCode(String callingPackage, String inputCode) {
- enforceModifyPermission();
- mAppOps.checkPackage(Binder.getCallingUid(), callingPackage);
- if (TextUtils.equals(callingPackage,
- TelecomManager.from(mPhone.getContext()).getDefaultDialerPackage())) {
- final Phone phone = getPhone(getDefaultSubscription());
- if (phone != null) {
- return phone.sendDialerCode(inputCode);
- }
- }
- return false;
- }
-
- /**
* Send the dialer code if called from the current default dialer or the caller has
* carrier privilege.
* @param inputCode The dialer code to send