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: ffe73fdf89

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

Change-Id: Ic0a3dbf96901123a6997791d7386874de22a749c
This commit is contained in:
TreeHugger Robot
2021-05-26 17:22:44 +00:00
committed by Automerger Merge Worker

View File

@@ -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);