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

Commit 48f8fe53 authored by Jonathan Basseri's avatar Jonathan Basseri Committed by Android (Google) Code Review
Browse files

Merge "Adding carrier variables to control certain network settings."

parents 571bb54c ad5baab5

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -30673,6 +30673,7 @@ package android.telephony { 
    method public android.os.Bundle getConfigForSubId(int);

    method public void reloadCarrierConfigForSubId(int);

    field public static final java.lang.String ACTION_CARRIER_CONFIG_CHANGED = "android.telephony.action.CARRIER_CONFIG_CHANGED";

    field public static final java.lang.String BOOL_APN_EXPAND = "bool_apn_expand";

    field public static final java.lang.String BOOL_CARRIER_VOLTE_AVAILABLE = "bool_carrier_volte_available";

    field public static final java.lang.String BOOL_CARRIER_VOLTE_PROVISIONED = "bool_carrier_volte_provisioned";

    field public static final java.lang.String BOOL_CARRIER_VOLTE_TTY_SUPPORTED = "bool_carrier_volte_tty_supported";

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -32827,6 +32827,7 @@ package android.telephony { 
    method public void reloadCarrierConfigForSubId(int);

    method public void updateConfigForPhoneId(int, java.lang.String);

    field public static final java.lang.String ACTION_CARRIER_CONFIG_CHANGED = "android.telephony.action.CARRIER_CONFIG_CHANGED";

    field public static final java.lang.String BOOL_APN_EXPAND = "bool_apn_expand";

    field public static final java.lang.String BOOL_CARRIER_VOLTE_AVAILABLE = "bool_carrier_volte_available";

    field public static final java.lang.String BOOL_CARRIER_VOLTE_PROVISIONED = "bool_carrier_volte_provisioned";

    field public static final java.lang.String BOOL_CARRIER_VOLTE_TTY_SUPPORTED = "bool_carrier_volte_tty_supported";

telephony/java/android/telephony/CarrierConfigManager.java

+6 −0
Original line number Diff line number Diff line
@@ -70,6 +70,11 @@ public class CarrierConfigManager { 
     */

    public static final String BOOL_SHOW_APN_SETTING_CDMA = "bool_show_apn_setting_cdma";



    /**

     * Control whether users can edit APNs in Settings.

     */

    public static final String BOOL_APN_EXPAND = "bool_apn_expand";



    /**

     * If Voice Radio Technology is RIL_RADIO_TECHNOLOGY_LTE:14 or RIL_RADIO_TECHNOLOGY_UNKNOWN:0

     * this is the value that should be used instead. A configuration value of
@@ -121,6 +126,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(BOOL_CARRIER_VOLTE_PROVISIONED, false);

        sDefaults.putBoolean(BOOL_CARRIER_VOLTE_TTY_SUPPORTED, true);

        sDefaults.putBoolean(BOOL_SHOW_APN_SETTING_CDMA, false);

        sDefaults.putBoolean(BOOL_APN_EXPAND, true);



        sDefaults.putInt(INT_VOLTE_REPLACEMENT_RAT, 0);