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

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

Merge "Return correct status for HID host disable request" am: 81a602ec am:... 

Merge "Return correct status for HID host disable request" am: 81a602ec am: b515266c am: 68cf7eee

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



Change-Id: Iae1a8018240637af93f56e66fc275b9cf3657732
Ignore-AOSP-First: this is an automerge
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 61a9401d 68cf7eee

system/bta/hh/bta_hh_act.cc

+2 −3
Original line number Diff line number Diff line
@@ -159,14 +159,13 @@ void bta_hh_api_disable(void) { 
 ******************************************************************************/

void bta_hh_disc_cmpl(void) {

  LOG_DEBUG("Disconnect complete");



  HID_HostDeregister();

  bta_hh_le_deregister();

  tBTA_HH_STATUS status = BTA_HH_OK;



  /* Deregister with lower layer */

  if (HID_HostDeregister() != HID_SUCCESS) status = BTA_HH_ERR;



  bta_hh_le_deregister();



  bta_hh_cleanup_disable(status);

}