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

Commit 78eeaa71 authored by Yun-hao Chung's avatar Yun-hao Chung Committed by Automerger Merge Worker
Browse files

Merge "Floss: Fix invalid handle detection in SCO connection complete hack"... 

Merge "Floss: Fix invalid handle detection in SCO connection complete hack" into main am: 57842ee8

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



Change-Id: Ibae85b1118ff75b17bc7f1a14b11af3a42c5dc5b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3e4d2088 57842ee8

system/gd/hci/acl_manager/classic_impl.h

+4 −2
Original line number Diff line number Diff line
@@ -406,8 +406,10 @@ struct classic_impl : public security::ISecurityManagerListener { 


    // HACK: Some failed SCO connections are reporting failures via

    //       ConnectComplete instead of ScoConnectionComplete.

    //       Drop such packets.

    if (handle == 0xffff && link_type == LinkType::SCO) {

    //       The pattern of it is that the handle is always 0xffff.

    //       We check it with 0x0fff since PDL only extracts 12 bits for handle.

    //       Drop such packets when the pattern is matched.

    if (handle == 0x0fff && link_type == LinkType::SCO) {

      LOG_ERROR(

          "ConnectionComplete with invalid handle(%u), link type(%u) and status(%d). Dropping packet.",

          handle,