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

Commit e484c580 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes Ice83e58e,Iccce2f80,I069bb911,I0470a82f,I4fa447eb, ... am: 5457ff2c 

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



Change-Id: I1a516a0c8195b7ed525bc730c53aaa677b84cd13
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ab330bca 5457ff2c

system/bta/dm/bta_dm_pm.cc

+5 −2
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ 
#include "bta/include/bta_api.h"

#include "bta/include/bta_dm_api.h"

#include "bta/sys/bta_sys.h"

#include "btif/include/core_callbacks.h"

#include "btif/include/stack_manager.h"

#include "device/include/controller.h"

#include "main/shim/dumpsys.h"

#include "osi/include/log.h"
@@ -863,8 +865,9 @@ static void bta_dm_pm_ssr(const RawAddress& peer_addr, const int ssr) { 
    /* HH has the per connection SSR preference, already read the SSR params

     * from BTA HH */

    if (current_ssr_index == BTA_DM_PM_SSR_HH) {

      if (bta_hh_read_ssr_param(peer_addr, &p_spec_cur->max_lat,

                                &p_spec_cur->min_rmt_to) == BTA_HH_ERR) {

      if (GetInterfaceToProfiles()->profileSpecific_HACK->bta_hh_read_ssr_param(

              peer_addr, &p_spec_cur->max_lat, &p_spec_cur->min_rmt_to) ==

          BTA_HH_ERR) {

        continue;

      }

    }

system/bta/gatt/bta_gattc_act.cc

+7 −2
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ 
#include "bta/gatt/bta_gattc_int.h"

#include "bta/hh/bta_hh_int.h"

#include "btif/include/btif_debug_conn.h"

#include "btif/include/core_callbacks.h"

#include "btif/include/stack_manager.h"

#include "device/include/controller.h"

#include "main/shim/dumpsys.h"

#include "osi/include/allocator.h"
@@ -144,7 +146,9 @@ void bta_gattc_disable() { 
    bta_gattc_cb.state = BTA_GATTC_STATE_DISABLING;

/* don't deregister HH GATT IF */

/* HH GATT IF will be deregistered by bta_hh_le_deregister when disable HH */

    if (!bta_hh_le_is_hh_gatt_if(bta_gattc_cb.cl_rcb[i].client_if)) {

    if (!GetInterfaceToProfiles()

             ->profileSpecific_HACK->bta_hh_le_is_hh_gatt_if(

                 bta_gattc_cb.cl_rcb[i].client_if)) {

      bta_gattc_deregister(&bta_gattc_cb.cl_rcb[i]);

    }

  }
@@ -224,7 +228,8 @@ void bta_gattc_register(const Uuid& app_uuid, tBTA_GATTC_CBACK* p_cback, 
void bta_gattc_deregister(tBTA_GATTC_RCB* p_clreg) {

  if (!p_clreg) {

    LOG(ERROR) << __func__ << ": Deregister Failed unknown client cif";

    bta_hh_cleanup_disable(BTA_HH_OK);

    GetInterfaceToProfiles()->profileSpecific_HACK->bta_hh_cleanup_disable(

        BTA_HH_OK);

    return;

  }

system/btif/Android.bp

+7 −0
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ cc_defaults { 
        "src/btif_uid.cc",

        "src/btif_util.cc",

        "src/btif_keystore.cc",

        "src/profile_log_levels.cc",

        "src/stack_manager.cc",

    ],

    generated_headers: [
@@ -429,6 +430,7 @@ cc_test { 
          ":LibBluetoothSources",

          ":TestCommonMainHandler",

          ":TestCommonMockFunctions",

          ":TestCommonCoreInterface",

          ":TestMockAndroidHardware",

          ":BtaDmSources",

          ":TestMockBtaAg",
@@ -485,6 +487,8 @@ cc_test { 
          "libaudio-a2dp-hw-utils",

          "libbluetooth-types",

          "libbt-audio-hal-interface",

          "libbt-sbc-decoder",

          "libbt-sbc-encoder",

          "libbt-stack",

          "libbtdevice",

          "lib-bt-packets",
@@ -548,6 +552,7 @@ cc_test { 
          ":LibBluetoothSources",

          ":TestCommonMainHandler",

          ":TestCommonMockFunctions",

          ":TestCommonCoreInterface",

          ":TestMockAndroidHardware",

          ":BtaDmSources",

          ":TestMockBtaAg",
@@ -603,6 +608,8 @@ cc_test { 
          "libaudio-a2dp-hw-utils",

          "libbluetooth-types",

          "libbt-audio-hal-interface",

          "libbt-sbc-decoder",

          "libbt-sbc-encoder",

          "libbt-stack",

          "libbtdevice",

          "lib-bt-packets",

system/btif/BUILD.gn

+1 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ static_library("btif") { 
    "src/btif_storage.cc",

    "src/btif_uid.cc",

    "src/btif_util.cc",

    "src/profile_log_levels.cc",

    "src/stack_manager.cc",

  ]

system/btif/include/btif_hh.h

+2 −0
Original line number Diff line number Diff line
@@ -143,4 +143,6 @@ extern void btif_hh_getreport(btif_hh_device_t* p_dev, 
                              uint16_t bufferSize);

extern void btif_hh_service_registration(bool enable);



extern void DumpsysHid(int fd);



#endif