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

Commit cd7e193e authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Merge "Ignore HCI_RMT_NAME_REQUEST_COMP_EVT" into main am: b249e1d3 

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



Change-Id: I7a7eaad37a918711faa5a7fffcccfc6bd96b1ba9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a7f3adab b249e1d3

system/stack/btu/btu_hcif.cc

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,6 @@ static void btu_hcif_log_event_metrics(uint8_t evt_code, const uint8_t* p_event) 
      log_classic_pairing_event(bda, handle, cmd, evt_code, status, reason, value);

      break;

    case HCI_SIMPLE_PAIRING_COMPLETE_EVT:

    case HCI_RMT_NAME_REQUEST_COMP_EVT:

      STREAM_TO_UINT8(status, p_event);

      STREAM_TO_BDADDR(bda, p_event);

      log_classic_pairing_event(bda, handle, cmd, evt_code, status, reason, value);
@@ -177,6 +176,7 @@ static void btu_hcif_log_event_metrics(uint8_t evt_code, const uint8_t* p_event) 
    case HCI_CONNECTION_COMP_EVT:     // EventCode::CONNECTION_COMPLETE

    case HCI_CONNECTION_REQUEST_EVT:  // EventCode::CONNECTION_REQUEST

    case HCI_DISCONNECTION_COMP_EVT:  // EventCode::DISCONNECTION_COMPLETE

    case HCI_RMT_NAME_REQUEST_COMP_EVT:  // EventCode::REMOTE_NAME_REQUEST_COMPLETE

    default:

      log::error(

              "Unexpectedly received event_code:0x{:02x} that should not be "