Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c760fd3b authored by SongFerng Wang's avatar SongFerng Wang Committed by Automerger Merge Worker
Browse files

Merge "Call waiting support USSD function" into sc-dev am: 245ce41e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14048554

Change-Id: I6e273b0a99cb58501e68a2a3616be691565b4f3a
parents 58120b90 245ce41e

telephony/java/android/telephony/CarrierConfigManager.java

+9 −0
Original line number Diff line number Diff line
@@ -3297,6 +3297,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
@@ -5377,6 +5385,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,"