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

Commit 744b2810 authored by Tyler Gunn's avatar Tyler Gunn Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE Add cc so carrier can opt to prefer an in-service sim for... 

Merge "DO NOT MERGE Add cc so carrier can opt to prefer an in-service sim for normal ecc call." into udc-qpr-dev
parents c0359f8b 962c19e2

telephony/java/android/telephony/CarrierConfigManager.java

+10 −0
Original line number Diff line number Diff line
@@ -1048,6 +1048,14 @@ public class CarrierConfigManager { 
    public static final String KEY_CARRIER_USE_IMS_FIRST_FOR_EMERGENCY_BOOL =

            "carrier_use_ims_first_for_emergency_bool";



    /**

     * When {@code true}, this carrier will preferentially dial normal routed emergency calls over

     * an in-service SIM if one is available.

     * @hide

     */

    public static final String KEY_PREFER_IN_SERVICE_SIM_FOR_NORMAL_ROUTED_EMERGENCY_CALLS_BOOL =

            "prefer_in_service_sim_for_normal_routed_emergency_calls_bool";



    /**

     * When {@code true}, the determination of whether to place a call as an emergency call will be

     * based on the known {@link android.telephony.emergency.EmergencyNumber}s for the SIM on which
@@ -9855,6 +9863,8 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_CARRIER_IMS_GBA_REQUIRED_BOOL, false);

        sDefaults.putBoolean(KEY_CARRIER_INSTANT_LETTERING_AVAILABLE_BOOL, false);

        sDefaults.putBoolean(KEY_CARRIER_USE_IMS_FIRST_FOR_EMERGENCY_BOOL, true);

        sDefaults.putBoolean(KEY_PREFER_IN_SERVICE_SIM_FOR_NORMAL_ROUTED_EMERGENCY_CALLS_BOOL,

                false);

        sDefaults.putBoolean(KEY_USE_ONLY_DIALED_SIM_ECC_LIST_BOOL, false);

        sDefaults.putString(KEY_CARRIER_NETWORK_SERVICE_WWAN_PACKAGE_OVERRIDE_STRING, "");

        sDefaults.putString(KEY_CARRIER_NETWORK_SERVICE_WLAN_PACKAGE_OVERRIDE_STRING, "");