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

Commit d942ff56 authored by Pranav Madapurmath's avatar Pranav Madapurmath Committed by Android (Google) Code Review
Browse files

Merge "Update carrier config for support auto unhold" into main

parents 365014e4 5e1ab784

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -45446,6 +45446,7 @@ package android.telephony { 
    field public static final String KEY_APN_EXPAND_BOOL = "apn_expand_bool";

    field public static final String KEY_APN_SETTINGS_DEFAULT_APN_TYPES_STRING_ARRAY = "apn_settings_default_apn_types_string_array";

    field public static final String KEY_AUTO_RETRY_ENABLED_BOOL = "auto_retry_enabled_bool";

    field @FlaggedApi("com.android.internal.telephony.flags.support_auto_unhold") public static final String KEY_AUTO_UNHOLD_ON_REMOTE_DISCONNECT_BOOL = "auto_unhold_on_remote_disconnect_bool";

    field @FlaggedApi("android.net.platform.flags.avoid_bad_wifi_from_carrier_config") public static final String KEY_AVOID_BAD_WIFI_BOOL = "avoid_bad_wifi_bool";

    field public static final String KEY_CALL_BARRING_DEFAULT_SERVICE_CLASS_INT = "call_barring_default_service_class_int";

    field public static final String KEY_CALL_BARRING_SUPPORTS_DEACTIVATE_ALL_BOOL = "call_barring_supports_deactivate_all_bool";

core/res/res/values/config.xml

+1 −0
Original line number Diff line number Diff line
@@ -4040,6 +4040,7 @@ 
    <!-- Flag specifying whether the device will use the "allow_hold_in_ims_call" carrier config

         option.  When false, the device will support holding of IMS calls, regardless of the

         carrier config setting. -->

    <!-- @deprecated all carriers should support hold so this is obsolete -->

    <bool name="config_device_respects_hold_carrier_config">true</bool>



    <!-- Flag specifying whether VT should be available for carrier: independent of

telephony/java/android/telephony/CarrierConfigManager.java

+11 −0
Original line number Diff line number Diff line
@@ -2664,9 +2664,19 @@ public class CarrierConfigManager { 
     * Where {@code config_device_respects_hold_carrier_config} is false, the value of

     * this carrier configuration is ignored.

     * @hide

     * @deprecated All carriers should support holding.

     */

    @Deprecated

    public static final String KEY_ALLOW_HOLD_IN_IMS_CALL_BOOL = "allow_hold_in_ims_call";













    /**













     * Flag indicating whether the carrier supports auto-unholding the background call on remotely













     * disconnected calls.













     */













    @FlaggedApi(Flags.FLAG_SUPPORT_AUTO_UNHOLD)













    public static final String KEY_AUTO_UNHOLD_ON_REMOTE_DISCONNECT_BOOL =













            "auto_unhold_on_remote_disconnect_bool";



























    /**















     * Flag indicating whether the carrier supports call deflection for an incoming IMS call.















     */










@@ -11002,6 +11012,7 @@ public class CarrierConfigManager {













        sDefaults = new PersistableBundle();















        sDefaults.putString(KEY_CARRIER_CONFIG_VERSION_STRING, "");















        sDefaults.putBoolean(KEY_ALLOW_HOLD_IN_IMS_CALL_BOOL, true);













        sDefaults.putBoolean(KEY_AUTO_UNHOLD_ON_REMOTE_DISCONNECT_BOOL, false);















        sDefaults.putBoolean(KEY_CARRIER_ALLOW_DEFLECT_IMS_CALL_BOOL, false);















        sDefaults.putBoolean(KEY_CARRIER_ALLOW_TRANSFER_IMS_CALL_BOOL, false);















        sDefaults.putBoolean(KEY_ALWAYS_PLAY_REMOTE_HOLD_TONE_BOOL, false);