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

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

Check BTM_ReadPowerMode and BTM_SetPowerMode return values am: 2f00e4cf am:... 

Check BTM_ReadPowerMode and BTM_SetPowerMode return values am: 2f00e4cf am: 421ee0fe am: b0d5233a

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1527468

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1834c55b41ee5d4e1e5e8fa100941a0cd11a7048
parents 5d794078 b0d5233a

system/bta/dm/bta_dm_pm.cc

+21 −5
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include "bta_sys.h"

#include "btm_api.h"

#include "device/include/controller.h"

#include "main/shim/dumpsys.h"

#include "osi/include/log.h"

#include "stack/include/acl_api.h"

#include "stack/include/btu.h"
@@ -667,11 +668,18 @@ static bool bta_dm_pm_park(const RawAddress& peer_addr) { 
  tBTM_PM_MODE mode = BTM_PM_STS_ACTIVE;



  /* if not in park mode, switch to park */

  BTM_ReadPowerMode(peer_addr, &mode);

  if (!BTM_ReadPowerMode(peer_addr, &mode)) {

    LOG_WARN("Unable to read power mode for peer:%s",

             PRIVATE_ADDRESS(peer_addr));

  }



  if (mode != BTM_PM_MD_PARK) {

    BTM_SetPowerMode(bta_dm_cb.pm_id, peer_addr,

    tBTM_STATUS status = BTM_SetPowerMode(bta_dm_cb.pm_id, peer_addr,

                                          &p_bta_dm_pm_md[BTA_DM_PM_PARK_IDX]);

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

      return true;

    }

    LOG_WARN("Unable to set park power mode");

  }

  return true;

}
@@ -691,7 +699,11 @@ static void bta_dm_pm_sniff(tBTA_DM_PEER_DEVICE* p_peer_dev, uint8_t index) { 
  tBTM_PM_PWR_MD pwr_md;

  tBTM_STATUS status;



  BTM_ReadPowerMode(p_peer_dev->peer_bdaddr, &mode);

  if (!BTM_ReadPowerMode(p_peer_dev->peer_bdaddr, &mode)) {

    LOG_WARN("Unable to read power mode for peer:%s",

             PRIVATE_ADDRESS(p_peer_dev->peer_bdaddr));

  }



  uint8_t* p_rem_feat = BTM_ReadRemoteFeatures(p_peer_dev->peer_bdaddr);

  APPL_TRACE_DEBUG("bta_dm_pm_sniff cur:%d, idx:%d, info:x%x", mode, index,

                   p_peer_dev->info);
@@ -819,7 +831,11 @@ void bta_dm_pm_active(const RawAddress& peer_addr) { 


  /* switch to active mode */

  pm.mode = BTM_PM_MD_ACTIVE;

  BTM_SetPowerMode(bta_dm_cb.pm_id, peer_addr, &pm);

  tBTM_STATUS status = BTM_SetPowerMode(bta_dm_cb.pm_id, peer_addr, &pm);

  if (status != BTM_CMD_STORED && status != BTM_CMD_STARTED) {

    LOG_WARN("Unable to set active mode for device:%s",

             PRIVATE_ADDRESS(peer_addr));

  }

}



/** BTM power manager callback */