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

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

Merge "BluetoothMetrics: Do not assert on events from remote device before... 

Merge "BluetoothMetrics: Do not assert on events from remote device before upload them" am: 0a32c411 am: 77f7fb75 am: c7bdd9c0 am: 6100d5a0

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



Change-Id: I767e7ded0983699ffbc0f6452eea9ebb4415f4d2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 87778856 6100d5a0

system/gd/hci/hci_metrics_logging.cc

+32 −8
Original line number Diff line number Diff line
@@ -652,7 +652,10 @@ void log_classic_pairing_other_hci_event(EventView packet) { 
    }

    case EventCode::REMOTE_OOB_DATA_REQUEST: {

      RemoteOobDataRequestView remote_oob_data_request_view = RemoteOobDataRequestView::Create(std::move(packet));

      ASSERT(remote_oob_data_request_view.IsValid());

      if (!remote_oob_data_request_view.IsValid()) {

        LOG_WARN("remote_oob_data_request_view not valid");

        return;

      }

      address = remote_oob_data_request_view.GetBdAddr();

      break;

    }
@@ -665,7 +668,10 @@ void log_classic_pairing_other_hci_event(EventView packet) { 
    }

    case EventCode::REMOTE_NAME_REQUEST_COMPLETE: {

      RemoteNameRequestCompleteView remote_name_request_complete_view = RemoteNameRequestCompleteView::Create(std::move(packet));

      ASSERT(remote_name_request_complete_view.IsValid());

      if (!remote_name_request_complete_view.IsValid()) {

        LOG_WARN("remote_name_request_complete_view not valid");

        return;

      }

      address = remote_name_request_complete_view.GetBdAddr();

      status = remote_name_request_complete_view.GetStatus();

      break;
@@ -831,14 +837,20 @@ void log_classic_pairing_command_status(std::unique_ptr<CommandView>& command_vi 
    case OpCode::REMOTE_OOB_DATA_REQUEST_REPLY: {

      RemoteOobDataRequestReplyView remote_oob_data_request_reply_view

      = RemoteOobDataRequestReplyView::Create(std::move(security_command_view));

      ASSERT(remote_oob_data_request_reply_view.IsValid());

      if (!remote_oob_data_request_reply_view.IsValid()) {

        LOG_WARN("remote_oob_data_request_reply_view is not valid.");

        return;

      }

      address = remote_oob_data_request_reply_view.GetBdAddr();

      break;

    }

    case OpCode::REMOTE_OOB_DATA_REQUEST_NEGATIVE_REPLY: {

      RemoteOobDataRequestNegativeReplyView remote_oob_data_request_negative_reply_view

      = RemoteOobDataRequestNegativeReplyView::Create(std::move(security_command_view));

      ASSERT(remote_oob_data_request_negative_reply_view.IsValid());

      if (!remote_oob_data_request_negative_reply_view.IsValid()) {

        LOG_WARN("remote_oob_data_request_negative_reply_view is not valid.");

        return;

      }

      address = remote_oob_data_request_negative_reply_view.GetBdAddr();

      break;

    }
@@ -994,19 +1006,31 @@ void log_classic_pairing_command_complete(EventView event_view, std::unique_ptr< 
    }

    case OpCode::REMOTE_OOB_DATA_REQUEST_REPLY: {

      auto remote_oob_data_request_reply_complete_view = RemoteOobDataRequestReplyCompleteView::Create(std::move(command_complete_view));

      ASSERT(remote_oob_data_request_reply_complete_view.IsValid());

      if (!remote_oob_data_request_reply_complete_view.IsValid()) {

        LOG_WARN("remote_oob_data_request_reply_complete_view is not valid.");

        return;

      }

      status = remote_oob_data_request_reply_complete_view.GetStatus();

      auto remote_oob_data_request_reply_view = RemoteOobDataRequestReplyView::Create(std::move(security_command_view));

      ASSERT(remote_oob_data_request_reply_view.IsValid());

      if (!remote_oob_data_request_reply_view.IsValid()) {

        LOG_WARN("remote_oob_data_request_reply_view is not valid.");

        return;

      }

      address = remote_oob_data_request_reply_view.GetBdAddr();

      break;

    }

    case OpCode::REMOTE_OOB_DATA_REQUEST_NEGATIVE_REPLY: {

      auto remote_oob_data_request_negative_reply_complete_view = RemoteOobDataRequestNegativeReplyCompleteView::Create(std::move(command_complete_view));

      ASSERT(remote_oob_data_request_negative_reply_complete_view.IsValid());

      if (!remote_oob_data_request_negative_reply_complete_view.IsValid()) {

        LOG_WARN("remote_oob_data_request_negative_reply_complete_view is not valid.");

        return;

      }

      status = remote_oob_data_request_negative_reply_complete_view.GetStatus();

      auto remote_oob_data_request_negative_reply_view = RemoteOobDataRequestNegativeReplyView::Create(std::move(security_command_view));

      ASSERT(remote_oob_data_request_negative_reply_view.IsValid());

      if (!remote_oob_data_request_negative_reply_view.IsValid()) {

        LOG_WARN("remote_oob_data_request_negative_reply_view is not valid.");

        return;

      }

      address = remote_oob_data_request_negative_reply_view.GetBdAddr();

      break;

    }