From b863fa65318c2f6b6844c19495d1baab6baf7b54 Mon Sep 17 00:00:00 2001 From: SongFerngWang Date: Wed, 31 Mar 2021 22:55:50 +0800 Subject: Call waiting support USSD function -Add new carrier config KEY_USE_CALL_WAITING_USSD_BOOL Bug: 180540626 Test: build pass. Manual test: set/get call waiting. Change-Id: I607da1f7c4748303c848f755e668854307c53d15 Merged-In: I607da1f7c4748303c848f755e668854307c53d15 --- telephony/java/android/telephony/CarrierConfigManager.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index f027cd15e399..073f1e3c8b75 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -3221,6 +3221,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 @@ -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," -- cgit v1.2.3-59-g8ed1b