Merge "[KDDI] Define carrier config for call forwarding items" into rvc-dev am: 07fd727050 am: 6dac0489e5 am: 4a55644d1d

Change-Id: I405669df25ad6a6d612b5cdad5fe8ea9f662e9a1
This commit is contained in:
Allen Su
2020-05-25 03:46:01 +00:00
committed by Automerger Merge Worker

View File

@@ -132,7 +132,7 @@ public class CarrierConfigManager {
*
* {@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.
* removed in the UI.
*
* By default this value is true.
* @hide
@@ -140,6 +140,32 @@ public class CarrierConfigManager {
public static final String KEY_CALL_FORWARDING_WHEN_UNREACHABLE_SUPPORTED_BOOL =
"call_forwarding_when_unreachable_supported_bool";
/**
* Boolean indicating if carrier supports call forwarding option "When unanswered".
*
* {@code true}: Call forwarding option "When unanswered" is supported.
* {@code false}: Call forwarding option "When unanswered" is not supported. Option will be
* removed in the UI.
*
* By default this value is true.
* @hide
*/
public static final String KEY_CALL_FORWARDING_WHEN_UNANSWERED_SUPPORTED_BOOL =
"call_forwarding_when_unanswered_supported_bool";
/**
* Boolean indicating if carrier supports call forwarding option "When busy".
*
* {@code true}: Call forwarding option "When busy" is supported.
* {@code false}: Call forwarding option "When busy" is not supported. Option will be
* removed in the UI.
*
* By default this value is true.
* @hide
*/
public static final String KEY_CALL_FORWARDING_WHEN_BUSY_SUPPORTED_BOOL =
"call_forwarding_when_busy_supported_bool";
/**
* Boolean indicating if the "Caller ID" item is visible in the Additional Settings menu.
* true means visible. false means gone.
@@ -3896,6 +3922,8 @@ public class CarrierConfigManager {
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_CALL_FORWARDING_WHEN_UNANSWERED_SUPPORTED_BOOL, true);
sDefaults.putBoolean(KEY_CALL_FORWARDING_WHEN_BUSY_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_DISABLE_SUPPLEMENTARY_SERVICES_IN_AIRPLANE_MODE_BOOL, false);