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

Commit 4b82ffad authored by Myles Watson's avatar Myles Watson Committed by Automerger Merge Worker
Browse files

Merge changes Ice677229,I9f6624f1 into main am: 065272f7

parents a3696144 065272f7
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -274,8 +274,10 @@ struct classic_impl : public security::ISecurityManagerListener {
            client_callbacks_, &ConnectionCallbacks::HACK_OnEscoConnectRequest, address, request.GetClassOfDevice());
        return;

      case ConnectionRequestLinkType::UNKNOWN:
        LOG_ERROR("Request has unknown ConnectionRequestLinkType.");
      default:
        LOG_ERROR(
            "Request has unknown ConnectionRequestLinkType %s",
            ConnectionRequestLinkTypeText(request.GetLinkType()).c_str());
        return;
    }

+1 −3
Original line number Diff line number Diff line
@@ -56,15 +56,13 @@
#include "stack/btm/btm_sec_cb.h"
#include "stack/include/bt_hdr.h"
#include "stack/include/btm_log_history.h"
#include "stack/include/main_thread.h"
#include "stack/l2cap/l2c_int.h"
#include "types/ble_address_with_type.h"
#include "types/raw_address.h"

extern tBTM_CB btm_cb;

bt_status_t do_in_main_thread(const base::Location& from_here,
                              base::OnceClosure task);

using namespace bluetooth;

class ConnectAddressWithType : public bluetooth::common::IRedactableLoggable {
+0 −1
Original line number Diff line number Diff line
@@ -5816,7 +5816,6 @@ packet ConnectionComplete : Event (event_code = CONNECTION_COMPLETE) {
}

enum ConnectionRequestLinkType : 8 {
  UNKNOWN = 0xFF,
  SCO = 0x00,
  ACL = 0x01,
  ESCO = 0x02,