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

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

Merge "stack::btm::rnr: BTM_CancelRemoteDeviceName Fail early" into main am:... 

Merge "stack::btm::rnr: BTM_CancelRemoteDeviceName Fail early" into main am: 155f306d am: 49c83332

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



Change-Id: I853e556a15e60ed65be9ab803ea3ad876a2d3410
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fbfa73b4 49c83332

system/stack/btm/btm_inq.cc

+21 −20
Original line number Diff line number Diff line
@@ -859,7 +859,10 @@ tBTM_STATUS BTM_CancelRemoteDeviceName(void) { 
  bool is_le;



  /* Make sure there is not already one in progress */

  if (btm_cb.btm_inq_vars.remname_active) {

  if (!btm_cb.btm_inq_vars.remname_active) {

    return (BTM_WRONG_MODE);

  }



  if (com::android::bluetooth::flags::rnr_store_device_type()) {

    is_le = (btm_cb.btm_inq_vars.remname_dev_type == BT_DEVICE_TYPE_BLE);

  } else {
@@ -879,8 +882,6 @@ tBTM_STATUS BTM_CancelRemoteDeviceName(void) { 
    }

  }

  return (BTM_CMD_STARTED);

  } else

    return (BTM_WRONG_MODE);

}



/*******************************************************************************