Merge "Merge "Add carrier config KEY_CALL_FORWARDING_WHEN_UNREACHABLE_SUPPORTED_BOOL" am: be83f253f4 am: 6671633935 am: 4fdf765e76" into qt-qpr1-dev-plus-aosp

am: 912e8b1d5d

Change-Id: Ia2f28b8044c376bc80dda17026189d86a76298ad
This commit is contained in:
Jordan Liu
2019-09-16 15:31:54 -07:00
committed by android-build-merger

View File

@@ -107,6 +107,19 @@ public class CarrierConfigManager {
public static final String KEY_CALL_FORWARDING_VISIBILITY_BOOL =
"call_forwarding_visibility_bool";
/**
* Boolean indicating if carrier supports call forwarding option "When unreachable".
*
* {@code true}: Call forwarding option "When unreachable" is supported.
* {@code false}: Call forwarding option "When unreachable" is not supported. Option will be
* greyed out in the UI.
*
* By default this value is true.
* @hide
*/
public static final String KEY_CALL_FORWARDING_WHEN_UNREACHABLE_SUPPORTED_BOOL =
"call_forwarding_when_unreachable_supported_bool";
/**
* Boolean indicating if the "Caller ID" item is visible in the Additional Settings menu.
* true means visible. false means gone.
@@ -3250,6 +3263,7 @@ public class CarrierConfigManager {
sDefaults.putBoolean(KEY_CALL_BARRING_SUPPORTS_PASSWORD_CHANGE_BOOL, true);
sDefaults.putBoolean(KEY_CALL_BARRING_SUPPORTS_DEACTIVATE_ALL_BOOL, true);
sDefaults.putBoolean(KEY_CALL_FORWARDING_VISIBILITY_BOOL, true);
sDefaults.putBoolean(KEY_CALL_FORWARDING_WHEN_UNREACHABLE_SUPPORTED_BOOL, true);
sDefaults.putBoolean(KEY_ADDITIONAL_SETTINGS_CALLER_ID_VISIBILITY_BOOL, true);
sDefaults.putBoolean(KEY_ADDITIONAL_SETTINGS_CALL_WAITING_VISIBILITY_BOOL, true);
sDefaults.putBoolean(KEY_IGNORE_SIM_NETWORK_LOCKED_EVENTS_BOOL, false);