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

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

legacy: Combine decl/def stack/acl/btm_pm::btm_pm_proc_mode_change am:... 

legacy: Combine decl/def stack/acl/btm_pm::btm_pm_proc_mode_change am: 66bb2df6 am: 3075c7ed am: 58e852fc am: c8ac4cc3

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

Change-Id: Ie8a8a56054c31b994884bc73c0a8f84a02b85aae
parents 678e0e57 c8ac4cc3

system/stack/acl/btm_pm.cc

+1 −2
Original line number Diff line number Diff line
@@ -711,7 +711,6 @@ void btm_pm_proc_cmd_status(tHCI_STATUS status) { 
void btm_pm_proc_mode_change(tHCI_STATUS hci_status, uint16_t hci_handle,

                             tHCI_MODE hci_mode, uint16_t interval) {

  tBTM_PM_STATUS mode = static_cast<tBTM_PM_STATUS>(hci_mode);

  tBTM_PM_STATE old_state;



  /* update control block */

  if (pm_mode_db.count(hci_handle) == 0) {
@@ -720,7 +719,7 @@ void btm_pm_proc_mode_change(tHCI_STATUS hci_status, uint16_t hci_handle, 
  }

  tBTM_PM_MCB* p_cb = &pm_mode_db[hci_handle];



  old_state = p_cb->state;

  const tBTM_PM_STATE old_state = p_cb->state;

  p_cb->state = mode;

  p_cb->interval = interval;