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

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

Merge "Remove delay_hidh_cleanup_until_hidh_ready_start flag" into main am:... 

Merge "Remove delay_hidh_cleanup_until_hidh_ready_start flag" into main am: 507340c1 am: 511c1d9f

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



Change-Id: If833d799e10c0205940fd6ca9e11f78a7c69429b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 97c756aa 511c1d9f

system/bta/hd/bta_hd_api.cc

+0 −6
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
#include <bluetooth/log.h>



#include "bta/hd/bta_hd_int.h"

#include "common/init_flags.h"

#include "os/log.h"

#include "osi/include/allocator.h"

#include "osi/include/compat.h"
@@ -84,11 +83,6 @@ void BTA_HdEnable(tBTA_HD_CBACK* p_cback) { 
void BTA_HdDisable(void) {

  log::verbose("");



  if (!bluetooth::common::init_flags::

          delay_hidh_cleanup_until_hidh_ready_start_is_enabled()) {

    bta_sys_deregister(BTA_ID_HD);

  }



  BT_HDR_RIGID* p_buf = (BT_HDR_RIGID*)osi_malloc(sizeof(BT_HDR_RIGID));

  p_buf->event = BTA_HD_API_DISABLE_EVT;

  bta_sys_sendmsg(p_buf);

system/btif/src/btif_hd.cc

+0 −5
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ 
#include "btif/include/btif_common.h"

#include "btif/include/btif_profile_storage.h"

#include "btif/include/btif_util.h"

#include "common/init_flags.h"

#include "include/hardware/bt_hd.h"

#include "internal_include/bt_target.h"

#include "osi/include/allocator.h"
@@ -200,10 +199,6 @@ static void btif_hd_upstreams_evt(uint16_t event, char* p_param) { 
                BTHD_APP_STATE_NOT_REGISTERED);

      if (btif_hd_cb.service_dereg_active) {

        log::warn("disabling hid device service now");

        if (!bluetooth::common::init_flags::

                delay_hidh_cleanup_until_hidh_ready_start_is_enabled()) {

          btif_hd_free_buf();

        }

        BTA_HdDisable();

      }

      break;

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,

        delay_hidh_cleanup_until_hidh_ready_start = true,

        device_iot_config_logging,

        dynamic_avrcp_version_enhancement = true,

        gatt_robust_caching_client = true,

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

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

        fn always_use_private_gatt_for_debugging_is_enabled() -> bool;

        fn bluetooth_power_telemetry_is_enabled() -> bool;

        fn delay_hidh_cleanup_until_hidh_ready_start_is_enabled() -> bool;

        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;