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

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

Merge "4/10 Unfriend bta::dm::tBTA_DM_PEER_DEVICE" into main am: 7f84b079 

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



Change-Id: Ia6691b42e30e46c5e78191638ddfa6fbe90a294c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 54784d3f 7f84b079

system/bta/dm/bta_dm_act.cc

+2 −2
Original line number Diff line number Diff line
@@ -2753,7 +2753,7 @@ void handle_remote_features_complete(const RawAddress& bd_addr) { 
      acl_peer_supports_sniff_subrating(bd_addr)) {

    LOG_DEBUG("Device supports sniff subrating peer:%s",

              ADDRESS_TO_LOGGABLE_CSTR(bd_addr));

    p_dev->info = BTA_DM_DI_USE_SSR;

    p_dev->set_both_device_ssr_capable();

  } else {

    LOG_DEBUG("Device does NOT support sniff subrating peer:%s",

              ADDRESS_TO_LOGGABLE_CSTR(bd_addr));
@@ -2810,7 +2810,7 @@ void bta_dm_acl_up(const RawAddress& bd_addr, tBT_TRANSPORT transport, 
    // data is when the BTA_dm_notify_remote_features_complete()

    // callback has completed.  The below assignment is kept for

    // transitional informational purposes only.

    device->info = BTA_DM_DI_USE_SSR;

    device->set_both_device_ssr_capable();

  }



  if (bta_dm_cb.p_sec_cback) {

system/bta/dm/bta_dm_int.h

+3 −0
Original line number Diff line number Diff line
@@ -271,6 +271,9 @@ struct tBTA_DM_PEER_DEVICE { 
  void reset_av_active() { info &= ~BTA_DM_DI_AV_ACTIVE; }

  bool is_av_active() const { return info & BTA_DM_DI_AV_ACTIVE; }



  // NOTE: Why is this not used as a bitmask

  void set_both_device_ssr_capable() { info = BTA_DM_DI_USE_SSR; }



  tBTA_DM_ENCRYPT_CBACK* p_encrypt_cback;

  tBTM_PM_STATUS prev_low; /* previous low power mode used */

  tBTA_DM_PM_ACTION pm_mode_attempted;