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

Commit d11b5be7 authored by Meng Wang's avatar Meng Wang Committed by Automerger Merge Worker
Browse files

Merge "Carrier config KEY_CARRIER_SUPPORTS_TETHERING_BOOL" am: 61ca1475 am:... 

Merge "Carrier config KEY_CARRIER_SUPPORTS_TETHERING_BOOL" am: 61ca1475 am: d5097a23 am: 96ff71d1

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

Change-Id: I1a4301236572284b972a840b259eedc66eafcdf5
parents ef678579 96ff71d1

core/api/current.txt

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

    field public static final String KEY_CARRIER_SUPPORTS_OPP_DATA_AUTO_PROVISIONING_BOOL = "carrier_supports_opp_data_auto_provisioning_bool";

    field public static final String KEY_CARRIER_SUPPORTS_SS_OVER_UT_BOOL = "carrier_supports_ss_over_ut_bool";

    field public static final String KEY_CARRIER_SUPPORTS_TETHERING_BOOL = "carrier_supports_tethering_bool";

    field public static final String KEY_CARRIER_USE_IMS_FIRST_FOR_EMERGENCY_BOOL = "carrier_use_ims_first_for_emergency_bool";

    field public static final String KEY_CARRIER_USSD_METHOD_INT = "carrier_ussd_method_int";

    field public static final String KEY_CARRIER_UT_PROVISIONING_REQUIRED_BOOL = "carrier_ut_provisioning_required_bool";

telephony/java/android/telephony/CarrierConfigManager.java

+7 −0
Original line number Diff line number Diff line
@@ -348,6 +348,12 @@ public class CarrierConfigManager { 
    public static final String

            KEY_REQUIRE_ENTITLEMENT_CHECKS_BOOL = "require_entitlement_checks_bool";



    /**

     * Flag indicating if the carrier supports tethering of mobile data.

     */

    public static final String KEY_CARRIER_SUPPORTS_TETHERING_BOOL =

            "carrier_supports_tethering_bool";



    /**

     * Flag indicating whether radio is to be restarted on error PDP_FAIL_REGULAR_DEACTIVATION

     * This is false by default.
@@ -5415,6 +5421,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_VOICE_PRIVACY_DISABLE_UI_BOOL, false);

        sDefaults.putBoolean(KEY_WORLD_PHONE_BOOL, false);

        sDefaults.putBoolean(KEY_REQUIRE_ENTITLEMENT_CHECKS_BOOL, true);

        sDefaults.putBoolean(KEY_CARRIER_SUPPORTS_TETHERING_BOOL, true);

        sDefaults.putBoolean(KEY_RESTART_RADIO_ON_PDP_FAIL_REGULAR_DEACTIVATION_BOOL, false);

        sDefaults.putIntArray(KEY_RADIO_RESTART_FAILURE_CAUSES_INT_ARRAY, new int[]{});

        sDefaults.putInt(KEY_VOLTE_REPLACEMENT_RAT_INT, 0);