Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add KEY_CARRIER_SUPPORTS_CALLER_ID_VERTICAL_SERVICE_CODES_BOOL for treating *67 and *82 as a temporary mode CLIR when dialing E911" am: 6f61cdcc1d

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1726551

Change-Id: I5a5a7083b7736ab07cb9600832146fb9cde35df1
This commit is contained in:
Shuo Qian
2021-06-03 20:01:17 +00:00
committed by Automerger Merge Worker
parent 17dc885001 6f61cdcc1d
commit de7a581ed8
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -3580,6 +3580,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
@@ -4910,6 +4917,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);