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

Commit afee1e5b authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

8/10 Unfriend bta::dm::tBTA_DM_PEER_DEVICE am: 8f2b8be1 am: 4598e87e 

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



Change-Id: I4fd6657b1dc33b3d44ca6e9da0bad5366f96181c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2e669c38 4598e87e

system/bta/dm/bta_dm_int.h

+4 −0
Original line number Diff line number Diff line
@@ -276,6 +276,10 @@ struct tBTA_DM_PEER_DEVICE { 
  void set_remote_init_sniff() { info |= BTA_DM_DI_ACP_SNIFF; }

  bool is_remote_init_sniff() const { return info & BTA_DM_DI_ACP_SNIFF; }



  void set_sniff_command_sent() { info |= BTA_DM_DI_SET_SNIFF; }

  void reset_sniff_command_sent() { info &= ~BTA_DM_DI_SET_SNIFF; }

  bool is_sniff_command_sent() const { return info & BTA_DM_DI_SET_SNIFF; }



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

  void set_both_device_ssr_capable() { info = BTA_DM_DI_USE_SSR; }

system/bta/dm/bta_dm_pm.cc

+4 −4
Original line number Diff line number Diff line
@@ -810,7 +810,7 @@ void bta_dm_pm_sniff(tBTA_DM_PEER_DEVICE* p_peer_dev, uint8_t index) { 
  status = BTM_SetPowerMode(bta_dm_cb.pm_id, p_peer_dev->peer_bdaddr, &pwr_md);

  if (status == BTM_CMD_STORED || status == BTM_CMD_STARTED) {

    p_peer_dev->reset_sniff_flags();

    p_peer_dev->info |= BTA_DM_DI_SET_SNIFF;

    p_peer_dev->set_sniff_command_sent();

  } else if (status == BTM_SUCCESS) {

    APPL_TRACE_DEBUG("bta_dm_pm_sniff BTM_SetPowerMode() returns BTM_SUCCESS");

    p_peer_dev->reset_sniff_flags();
@@ -1065,9 +1065,9 @@ void bta_dm_pm_btm_status(const RawAddress& bd_addr, tBTM_PM_STATUS status, 
         */

        bta_dm_pm_stop_timer(bd_addr);

      } else {

        tBTA_DM_DEV_INFO info = p_dev->Info();

        bool is_sniff_command_sent = p_dev->is_sniff_command_sent();

        p_dev->reset_sniff_flags();

        if (info & BTA_DM_DI_SET_SNIFF)

        if (is_sniff_command_sent)

          p_dev->set_local_init_sniff();

        else

          p_dev->set_remote_init_sniff();
@@ -1075,7 +1075,7 @@ void bta_dm_pm_btm_status(const RawAddress& bd_addr, tBTM_PM_STATUS status, 
      break;



    case BTM_PM_STS_ERROR:

      p_dev->info &= ~BTA_DM_DI_SET_SNIFF;

      p_dev->reset_sniff_command_sent();

      break;



    default: