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

Commit 60f6674c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Unhide KEY_CAPABILITIES_EXEMPT_FROM_SINGLE_DC_CHECK_INT_ARRAY"

parents 9b1d2ca3 7f0485b9

core/api/current.txt

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

    field public static final String KEY_CALL_FORWARDING_BLOCKS_WHILE_ROAMING_STRING_ARRAY = "call_forwarding_blocks_while_roaming_string_array";

    field public static final String KEY_CALL_REDIRECTION_SERVICE_COMPONENT_NAME_STRING = "call_redirection_service_component_name_string";

    field public static final String KEY_CAPABILITIES_EXEMPT_FROM_SINGLE_DC_CHECK_INT_ARRAY = "capabilities_exempt_from_single_dc_check_int_array";

    field public static final String KEY_CARRIER_ALLOW_DEFLECT_IMS_CALL_BOOL = "carrier_allow_deflect_ims_call_bool";

    field public static final String KEY_CARRIER_ALLOW_TURNOFF_IMS_BOOL = "carrier_allow_turnoff_ims_bool";

    field public static final String KEY_CARRIER_APP_REQUIRED_DURING_SIM_SETUP_BOOL = "carrier_app_required_during_setup_bool";

telephony/java/android/telephony/CarrierConfigManager.java

+4 −5
Original line number Diff line number Diff line
@@ -579,17 +579,16 @@ public class CarrierConfigManager { 
     * List of network type constants which support only a single data connection at a time.

     * Some carriers do not support multiple PDP on UMTS.

     * @see TelephonyManager NETWORK_TYPE_*

     * @see #KEY_ONLY_SINGLE_DC_ALLOWED_INT_ARRAY

     */

    public static final String

            KEY_ONLY_SINGLE_DC_ALLOWED_INT_ARRAY = "only_single_dc_allowed_int_array";



    /**

     * List of network capabilities which, if requested, will exempt the request from single PDN

     * connection checks.

     * Only apply if {@link #KEY_ONLY_SINGLE_DC_ALLOWED_INT_ARRAY} specifies the network types that

     * support a single data connection at a time. This key defines a list of network capabilities

     * which, if requested, will exempt the request from single data connection checks.

     * @see NetworkCapabilities NET_CAPABILITY_*

     * @see #KEY_ONLY_SINGLE_DC_ALLOWED_INT_ARRAY

     *

     * @hide

     */

    public static final String KEY_CAPABILITIES_EXEMPT_FROM_SINGLE_DC_CHECK_INT_ARRAY =

            "capabilities_exempt_from_single_dc_check_int_array";