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

Commit 3b0aa385 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add KEY_CARRIER_SUPPORTS_CALLER_ID_VERTICAL_SERVICE_CODES_BOOL for... 

Merge "Add KEY_CARRIER_SUPPORTS_CALLER_ID_VERTICAL_SERVICE_CODES_BOOL for treating *67 and *82 as a temporary mode CLIR when dialing E911" into sc-dev am: ffe73fdf

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14467278

Change-Id: I83e684e71bc1e5691d290d29aa386babf249c698
parents 060c5af4 ffe73fdf

telephony/java/android/telephony/CarrierConfigManager.java

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

            "emergency_number_prefix_string_array";



    /**

     * Indicates whether carrier treats "*67" or "*82" as a temporary mode CLIR.

     * @hide

     */

    public static final String KEY_CARRIER_SUPPORTS_CALLER_ID_VERTICAL_SERVICE_CODES_BOOL =

            "carrier_supports_caller_id_vertical_service_codes_bool";



    /**

     * Smart forwarding config. Smart forwarding is a feature to configure call forwarding to a

     * different SIM in the device when one SIM is not reachable. The config here specifies a smart
@@ -5496,6 +5503,7 @@ public class CarrierConfigManager { 
                        1 /* Roaming Indicator Off */

                });

        sDefaults.putStringArray(KEY_EMERGENCY_NUMBER_PREFIX_STRING_ARRAY, new String[0]);

        sDefaults.putBoolean(KEY_CARRIER_SUPPORTS_CALLER_ID_VERTICAL_SERVICE_CODES_BOOL, false);

        sDefaults.putBoolean(KEY_USE_USIM_BOOL, false);

        sDefaults.putBoolean(KEY_SHOW_WFC_LOCATION_PRIVACY_POLICY_BOOL, false);

        sDefaults.putBoolean(KEY_AUTO_CANCEL_CS_REJECT_NOTIFICATION, true);