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

Commit 47208e2c authored by Chen Xu's avatar Chen Xu Committed by android-build-merger
Browse files

Merge "initial value for data_roaming based on carrier" into oc-dr1-dev 

am: 068397a3

Change-Id: I5c65666208e834a5b0ad5280f1670a0d7b31aa31
parents 8e9b7efe 068397a3

telephony/java/android/telephony/CarrierConfigManager.java

+8 −0
Original line number Diff line number Diff line
@@ -1065,6 +1065,13 @@ public class CarrierConfigManager { 
    public static final String KEY_CARRIER_APP_NO_WAKE_SIGNAL_CONFIG_STRING_ARRAY =

            "carrier_app_no_wake_signal_config";



    /**

     * Default value for {@link Settings.Global#DATA_ROAMING}

     * @hide

     */

    public static final String KEY_CARRIER_DEFAULT_DATA_ROAMING_ENABLED_BOOL =

            "carrier_default_data_roaming_enabled_bool";



    /**

     * Determines whether the carrier supports making non-emergency phone calls while the phone is

     * in emergency callback mode.  Default value is {@code true}, meaning that non-emergency calls
@@ -1656,6 +1663,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_CARRIER_NAME_OVERRIDE_BOOL, false);

        sDefaults.putString(KEY_CARRIER_NAME_STRING, "");

        sDefaults.putBoolean(KEY_SUPPORT_DIRECT_FDN_DIALING_BOOL, false);

        sDefaults.putBoolean(KEY_CARRIER_DEFAULT_DATA_ROAMING_ENABLED_BOOL, false);



        // MMS defaults

        sDefaults.putBoolean(KEY_MMS_ALIAS_ENABLED_BOOL, false);