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

Commit 4bd76a66 authored by Etan Cohen's avatar Etan Cohen Committed by Automerger Merge Worker
Browse files

Merge "[Provider Model] Carrier configurations to allow CWF configurations"... 

Merge "[Provider Model] Carrier configurations to allow CWF configurations" into sc-dev am: 1bc1a19b

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

Change-Id: Iae81bfc9ffcbca3f39e795fccd3d0a15e4842a81
parents 5feee768 1bc1a19b

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -40376,6 +40376,7 @@ package android.telephony { 
    field public static final String KEY_CARRIER_NAME_OVERRIDE_BOOL = "carrier_name_override_bool";

    field public static final String KEY_CARRIER_NAME_STRING = "carrier_name_string";

    field public static final String KEY_CARRIER_NR_AVAILABILITY_INT = "carrier_nr_availability_int";

    field public static final String KEY_CARRIER_PROVISIONS_WIFI_MERGED_NETWORKS_BOOL = "carrier_provisions_wifi_merged_networks_bool";

    field public static final String KEY_CARRIER_RCS_PROVISIONING_REQUIRED_BOOL = "carrier_rcs_provisioning_required_bool";

    field public static final String KEY_CARRIER_SETTINGS_ACTIVITY_COMPONENT_NAME_STRING = "carrier_settings_activity_component_name_string";

    field public static final String KEY_CARRIER_SETTINGS_ENABLE_BOOL = "carrier_settings_enable_bool";

telephony/java/android/telephony/CarrierConfigManager.java

+11 −0
Original line number Diff line number Diff line
@@ -4713,6 +4713,16 @@ public class CarrierConfigManager { 
    public static final String KEY_ALLOWED_INITIAL_ATTACH_APN_TYPES_STRING_ARRAY =

            "allowed_initial_attach_apn_types_string_array";



    /**

     * Indicates whether or not the carrier will provision merged carrier Wi-Fi offload networks.

     * Such networks are considered part of the core carrier network.

     *

     * This configuration will be use to gate whether such configurations are allowed to the carrier

     * and correspondingly enable UI elements which are required for such configurations.

     */

    public static final String KEY_CARRIER_PROVISIONS_WIFI_MERGED_NETWORKS_BOOL =

            "carrier_provisions_wifi_merged_networks_bool";



    /** The default value for every variable. */

    private final static PersistableBundle sDefaults;
@@ -5276,6 +5286,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_HIDE_ENABLE_2G, false);

        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);

    }



    /**