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

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

Merge "Demote ASSERT to LOG_ERROR for double disconnect" am: 7affcb54 am:... 

Merge "Demote ASSERT to LOG_ERROR for double disconnect" am: 7affcb54 am: bf0d249e am: 85a03a60 am: b6cd7220 am: 4a8b7205

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



Change-Id: I37c95af616942248955b35b0f9e05cf0ece2d4b3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c41eb622 4a8b7205

system/main/shim/acl.cc

+9 −2
Original line number Diff line number Diff line
@@ -434,8 +434,15 @@ class ShimAclConnection { 
  }



  void Disconnect() {

    ASSERT_LOG(!is_disconnected_,

               "Cannot disconnect ACL multiple times handle:%04x", handle_);

    if (!is_disconnected_) {

      LOG_ERROR(

          "Cannot disconnect ACL multiple times handle:%04x creation_time:%s",

          handle_,

          common::StringFormatTimeWithMilliseconds(

              kConnectionDescriptorTimeFormat, creation_time_)

              .c_str());

      return;

    }

    is_disconnected_ = true;

    UnregisterEnqueue();

    queue_up_end_->UnregisterDequeue();