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

Commit bfa1731c authored by David Duarte's avatar David Duarte Committed by Automerger Merge Worker
Browse files

Merge "Remove clear_hidd_interrupt_cid_on_disconnect flag" into main am: de7cd43c am: cac59805 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2994774



Change-Id: I8575c5e820a551e8f0977b8886877d0da35085b9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0147435a cac59805

system/gd/rust/common/src/init_flags.rs

+0 −1
Original line number Diff line number Diff line
@@ -231,7 +231,6 @@ init_flags!( 
        btm_dm_flush_discovery_queue_on_search_cancel,

        bta_dm_stop_discovery_on_search_cancel,

        classic_discovery_only,

        clear_hidd_interrupt_cid_on_disconnect = true,

        delay_hidh_cleanup_until_hidh_ready_start = true,

        device_iot_config_logging,

        dynamic_avrcp_version_enhancement = true,

system/gd/rust/shim/src/init_flags.rs

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ mod ffi { 
        fn btm_dm_flush_discovery_queue_on_search_cancel_is_enabled() -> bool;

        fn bta_dm_stop_discovery_on_search_cancel_is_enabled() -> bool;

        fn classic_discovery_only_is_enabled() -> bool;

        fn clear_hidd_interrupt_cid_on_disconnect_is_enabled() -> bool;

        fn device_iot_config_logging_is_enabled() -> bool;

        fn dynamic_avrcp_version_enhancement_is_enabled() -> bool;

        fn gatt_robust_caching_client_is_enabled() -> bool;

system/stack/hid/hidd_conn.cc

+1 −5
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
#include <cstdint>



#include "bta/include/bta_sec_api.h"

#include "common/init_flags.h"

#include "internal_include/bt_target.h"

#include "os/log.h"

#include "osi/include/allocator.h"
@@ -369,11 +368,8 @@ static void hidd_l2cif_disconnect(uint16_t cid) { 


    // now disconnect CTRL

    L2CA_DisconnectReq(p_hcon->ctrl_cid);

    if (bluetooth::common::init_flags::

            clear_hidd_interrupt_cid_on_disconnect_is_enabled()) {

    p_hcon->ctrl_cid = 0;

  }

  }



  if ((p_hcon->ctrl_cid == 0) && (p_hcon->intr_cid == 0)) {

    log::verbose("INTR and CTRL disconnected");