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

Commit b6ca34a3 authored by Abhijith Shastry's avatar Abhijith Shastry Committed by Android (Google) Code Review
Browse files

Merge "Add a carrier config for RCS config server URL."

parents afc0c73a 2215c9b5

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -36931,6 +36931,7 @@ package android.telephony { 
    field public static final java.lang.String KEY_MMS_USER_AGENT_STRING = "userAgent";

    field public static final java.lang.String KEY_OPERATOR_SELECTION_EXPAND_BOOL = "operator_selection_expand_bool";

    field public static final java.lang.String KEY_PREFER_2G_BOOL = "prefer_2g_bool";

    field public static final java.lang.String KEY_RCS_CONFIG_SERVER_URL_STRING = "rcs_config_server_url_string";

    field public static final java.lang.String KEY_REQUIRE_ENTITLEMENT_CHECKS_BOOL = "require_entitlement_checks_bool";

    field public static final java.lang.String KEY_SHOW_APN_SETTING_CDMA_BOOL = "show_apn_setting_cdma_bool";

    field public static final java.lang.String KEY_SHOW_CDMA_CHOICES_BOOL = "show_cdma_choices_bool";

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -40013,6 +40013,7 @@ package android.telephony { 
    field public static final java.lang.String KEY_MMS_USER_AGENT_STRING = "userAgent";

    field public static final java.lang.String KEY_OPERATOR_SELECTION_EXPAND_BOOL = "operator_selection_expand_bool";

    field public static final java.lang.String KEY_PREFER_2G_BOOL = "prefer_2g_bool";

    field public static final java.lang.String KEY_RCS_CONFIG_SERVER_URL_STRING = "rcs_config_server_url_string";

    field public static final java.lang.String KEY_REQUIRE_ENTITLEMENT_CHECKS_BOOL = "require_entitlement_checks_bool";

    field public static final java.lang.String KEY_SHOW_APN_SETTING_CDMA_BOOL = "show_apn_setting_cdma_bool";

    field public static final java.lang.String KEY_SHOW_CDMA_CHOICES_BOOL = "show_cdma_choices_bool";

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -37009,6 +37009,7 @@ package android.telephony { 
    field public static final java.lang.String KEY_MMS_USER_AGENT_STRING = "userAgent";

    field public static final java.lang.String KEY_OPERATOR_SELECTION_EXPAND_BOOL = "operator_selection_expand_bool";

    field public static final java.lang.String KEY_PREFER_2G_BOOL = "prefer_2g_bool";

    field public static final java.lang.String KEY_RCS_CONFIG_SERVER_URL_STRING = "rcs_config_server_url_string";

    field public static final java.lang.String KEY_REQUIRE_ENTITLEMENT_CHECKS_BOOL = "require_entitlement_checks_bool";

    field public static final java.lang.String KEY_SHOW_APN_SETTING_CDMA_BOOL = "show_apn_setting_cdma_bool";

    field public static final java.lang.String KEY_SHOW_CDMA_CHOICES_BOOL = "show_cdma_choices_bool";

telephony/java/android/telephony/CarrierConfigManager.java

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

    public static final String FILTERED_CNAP_NAMES_STRING_ARRAY = "filtered_cnap_names_string_array";



    /**

     * The RCS configuration server URL. This URL is used to initiate RCS provisioning.

     */

    public static final String KEY_RCS_CONFIG_SERVER_URL_STRING = "rcs_config_server_url_string";



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

    private final static PersistableBundle sDefaults;
@@ -1097,6 +1102,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_USE_RCS_PRESENCE_BOOL, false);

        sDefaults.putBoolean(KEY_FORCE_IMEI_BOOL, false);

        sDefaults.putInt(KEY_CDMA_ROAMING_MODE_INT, CDMA_ROAMING_MODE_RADIO_DEFAULT);

        sDefaults.putString(KEY_RCS_CONFIG_SERVER_URL_STRING, "");



        // Carrier Signalling Receivers

        sDefaults.putStringArray(KEY_SIGNAL_REDIRECTION_RECEIVER_STRING_ARRAY, null);