commit fab90cdb649c420042512e82e01030d81f8c64a0
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Apr 08 08:03:33 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Apr 08 08:03:35 2017 +0000
tree b1651a9975c9a66a28518802a9b5d022840699ec
parent 2ccb36a82498ba9571b36d7fa1762e5da38e936d
parent 995f30b2dcb851a8d0b83e9351fe425697f8e87c

Merge "Import translations. DO NOT MERGE" into oc-dev

AndroidManifest.xml

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" />

src/com/android/phone/MobileNetworkSettings.java

diff --git a/src/com/android/phone/MobileNetworkSettings.java b/src/com/android/phone/MobileNetworkSettings.java
index d023b20..8d58107 100644
--- a/src/com/android/phone/MobileNetworkSettings.java
+++ b/src/com/android/phone/MobileNetworkSettings.java
@@ -711,9 +711,10 @@
                 android.util.Log.d(LOG_TAG, "keep ltePref");
             }
 
-            // Enable enhanced 4G LTE mode settings depending on whether exists on platform
             if (!(ImsManager.isVolteEnabledByPlatform(getActivity())
-                    && ImsManager.isVolteProvisionedOnDevice(getActivity()))) {
+                    && ImsManager.isVolteProvisionedOnDevice(getActivity()))
+                    || carrierConfig.getBoolean(
+                        CarrierConfigManager.KEY_HIDE_ENHANCED_4G_LTE_BOOL)) {
                 Preference pref = prefSet.findPreference(BUTTON_4G_LTE_KEY);
                 if (pref != null) {
                     prefSet.removePreference(pref);

src/com/android/phone/PhoneInterfaceManager.java

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