Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit faced6d2 authored by Calvin Pan's avatar Calvin Pan Committed by Automerger Merge Worker
Browse files

Merge "Add a carrier config for PROVISIONING button in radioinfo" into sc-dev am: 4e942668 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13775005

Change-Id: I14a61278a5f057532beb9748f7b50cac3833f232
parents 777e9b30 4e942668

telephony/java/android/telephony/CarrierConfigManager.java

+17 −0
Original line number Diff line number Diff line
@@ -4076,6 +4076,22 @@ public class CarrierConfigManager { 
    public static final String KEY_IS_OPPORTUNISTIC_SUBSCRIPTION_BOOL =

            "is_opportunistic_subscription_bool";



    /**

     * The flatten string {@link android.content.ComponentName componentName} of carrier

     * provisioning app receiver.

     *

     * <p>

     * The RadioInfo activity(*#*#INFO#*#*) will broadcast an intent to this receiver when the

     * "Carrier Provisioning Info" or "Trigger Carrier Provisioning" button clicked.

     *

     * <p>

     * e.g, com.google.android.carrierPackageName/.CarrierReceiverName

     *

     * @hide

     */

    public static final String KEY_CARRIER_PROVISIONING_APP_STRING =

            "carrier_provisioning_app_string";



    /**

     * Configs used by the IMS stack.

     */
@@ -5374,6 +5390,7 @@ public class CarrierConfigManager { 
        sDefaults.putStringArray(KEY_ALLOWED_INITIAL_ATTACH_APN_TYPES_STRING_ARRAY,

                new String[]{"ia", "default", "ims", "mms", "dun", "emergency"});

        sDefaults.putBoolean(KEY_CARRIER_PROVISIONS_WIFI_MERGED_NETWORKS_BOOL, false);

        sDefaults.putString(KEY_CARRIER_PROVISIONING_APP_STRING, "");

    }



    /**