diff options
| author | Allen Su <allenwtsu@google.com> | 2020-06-04 03:06:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-06-04 03:06:44 +0000 |
| commit | f7c1dc5a3ad9b84b045db5ec1b0abcc1ac66152e (patch) | |
| tree | ee2fab35a67435861d23fe918168b04bb0e5072d | |
| parent | 5a7fb758fb9c4a9a9d3ac37abcef22505b889919 (diff) | |
| parent | 2a4441dc1c03254715eb634492bf233cb3f91a92 (diff) | |
Merge "[KDDI] Define carrier config for call forwarding items"
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 30 |
1 files changed, 29 insertions, 1 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 4d15a93c2dbe..91fc42996f3b 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -133,7 +133,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 @@ -141,6 +141,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. @@ -3805,6 +3831,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); |