diff options
| author | 2021-04-12 04:18:12 +0000 | |
|---|---|---|
| committer | 2021-04-12 04:18:12 +0000 | |
| commit | c85f6750357ec92c79f1d6a8a78bcc59a61310c7 (patch) | |
| tree | 071688a6f2a575417df32ffeba67ecd6227ba3d6 | |
| parent | f107ad72aa33464c1faff5f11d5ea64aa807122c (diff) | |
| parent | cf85599687ca55154dd49376a93f78fcd4fe5749 (diff) | |
Merge "Call waiting support USSD function" am: 7d07fce12b am: cf85599687
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1667001
Change-Id: If75cc1d84d69e7cf3c38fe0fcbfa1e2d21a1661d
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 92a3c39435ac..dd0a82086dd3 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -3222,6 +3222,14 @@ public class CarrierConfigManager { public static final String KEY_USE_CALLER_ID_USSD_BOOL = "use_caller_id_ussd_bool"; /** + * Call waiting uses USSD command without SS command. + * When {@code true}, the call waiting query/set by ussd command. + * When {@code false}, doesn't use USSD to query/set call waiting. + * @hide + */ + public static final String KEY_USE_CALL_WAITING_USSD_BOOL = "use_call_waiting_ussd_bool"; + + /** * Specifies the service class for call waiting service. * Default value is * {@link com.android.internal.telephony.CommandsInterface#SERVICE_CLASS_VOICE}. @@ -4820,6 +4828,7 @@ public class CarrierConfigManager { sDefaults.putBoolean(KEY_SUPPORT_EMERGENCY_DIALER_SHORTCUT_BOOL, true); sDefaults.putBoolean(KEY_USE_CALL_FORWARDING_USSD_BOOL, false); sDefaults.putBoolean(KEY_USE_CALLER_ID_USSD_BOOL, false); + sDefaults.putBoolean(KEY_USE_CALL_WAITING_USSD_BOOL, false); sDefaults.putInt(KEY_CALL_WAITING_SERVICE_CLASS_INT, 1 /* SERVICE_CLASS_VOICE */); sDefaults.putString(KEY_5G_ICON_CONFIGURATION_STRING, "connected_mmwave:5G,connected:5G,not_restricted_rrc_idle:5G," |