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

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

Merge "RootCanal: Fix typos in enhanced eSCO link commands parameter... 

Merge "RootCanal: Fix typos in enhanced eSCO link commands parameter validation" am: c73a4d83 am: bdbe725b am: 08fba08b am: 9763ef85

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



Change-Id: Ib96fd2e50e48415ec0a92704c698d6c10076d4ce
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents df216972 9763ef85

tools/rootcanal/model/controller/dual_mode_controller.cc

+8 −8
Original line number Original line Diff line number Diff line
@@ -790,7 +790,7 @@ void DualModeController::EnhancedSetupSynchronousConnection( 
  auto receive_bandwidth = command_view.GetReceiveBandwidth();

  auto receive_bandwidth = command_view.GetReceiveBandwidth();

  if (transmit_coding_format.coding_format_ ==

  if (transmit_coding_format.coding_format_ ==

          bluetooth::hci::ScoCodingFormatValues::TRANSPARENT &&

          bluetooth::hci::ScoCodingFormatValues::TRANSPARENT &&

      transmit_coding_format.coding_format_ ==

      input_coding_format.coding_format_ ==

          bluetooth::hci::ScoCodingFormatValues::TRANSPARENT &&

          bluetooth::hci::ScoCodingFormatValues::TRANSPARENT &&

      transmit_bandwidth != input_bandwidth) {

      transmit_bandwidth != input_bandwidth) {

    LOG_INFO(

    LOG_INFO(
@@ -805,7 +805,7 @@ void DualModeController::EnhancedSetupSynchronousConnection( 
  }

  }

  if ((transmit_coding_format.coding_format_ ==

  if ((transmit_coding_format.coding_format_ ==

       bluetooth::hci::ScoCodingFormatValues::TRANSPARENT) !=

       bluetooth::hci::ScoCodingFormatValues::TRANSPARENT) !=

      (transmit_coding_format.coding_format_ ==

      (input_coding_format.coding_format_ ==

       bluetooth::hci::ScoCodingFormatValues::TRANSPARENT)) {

       bluetooth::hci::ScoCodingFormatValues::TRANSPARENT)) {

    LOG_INFO(

    LOG_INFO(

        "EnhancedSetupSynchronousConnection: rejected Transmit_Coding_Format "

        "EnhancedSetupSynchronousConnection: rejected Transmit_Coding_Format "
@@ -821,7 +821,7 @@ void DualModeController::EnhancedSetupSynchronousConnection( 
  // Controller shall not modify the data sent to the Host.

  // Controller shall not modify the data sent to the Host.

  if (receive_coding_format.coding_format_ ==

  if (receive_coding_format.coding_format_ ==

          bluetooth::hci::ScoCodingFormatValues::TRANSPARENT &&

          bluetooth::hci::ScoCodingFormatValues::TRANSPARENT &&

      receive_coding_format.coding_format_ ==

      output_coding_format.coding_format_ ==

          bluetooth::hci::ScoCodingFormatValues::TRANSPARENT &&

          bluetooth::hci::ScoCodingFormatValues::TRANSPARENT &&

      receive_bandwidth != output_bandwidth) {

      receive_bandwidth != output_bandwidth) {

    LOG_INFO(

    LOG_INFO(
@@ -836,7 +836,7 @@ void DualModeController::EnhancedSetupSynchronousConnection( 
  }

  }

  if ((receive_coding_format.coding_format_ ==

  if ((receive_coding_format.coding_format_ ==

       bluetooth::hci::ScoCodingFormatValues::TRANSPARENT) !=

       bluetooth::hci::ScoCodingFormatValues::TRANSPARENT) !=

      (receive_coding_format.coding_format_ ==

      (output_coding_format.coding_format_ ==

       bluetooth::hci::ScoCodingFormatValues::TRANSPARENT)) {

       bluetooth::hci::ScoCodingFormatValues::TRANSPARENT)) {

    LOG_INFO(

    LOG_INFO(

        "EnhancedSetupSynchronousConnection: rejected Receive_Coding_Format "

        "EnhancedSetupSynchronousConnection: rejected Receive_Coding_Format "
@@ -935,7 +935,7 @@ void DualModeController::EnhancedAcceptSynchronousConnection( 
  auto receive_bandwidth = command_view.GetReceiveBandwidth();

  auto receive_bandwidth = command_view.GetReceiveBandwidth();

  if (transmit_coding_format.coding_format_ ==

  if (transmit_coding_format.coding_format_ ==

          bluetooth::hci::ScoCodingFormatValues::TRANSPARENT &&

          bluetooth::hci::ScoCodingFormatValues::TRANSPARENT &&

      transmit_coding_format.coding_format_ ==

      input_coding_format.coding_format_ ==

          bluetooth::hci::ScoCodingFormatValues::TRANSPARENT &&

          bluetooth::hci::ScoCodingFormatValues::TRANSPARENT &&

      transmit_bandwidth != input_bandwidth) {

      transmit_bandwidth != input_bandwidth) {

    LOG_INFO(

    LOG_INFO(
@@ -950,7 +950,7 @@ void DualModeController::EnhancedAcceptSynchronousConnection( 
  }

  }

  if ((transmit_coding_format.coding_format_ ==

  if ((transmit_coding_format.coding_format_ ==

       bluetooth::hci::ScoCodingFormatValues::TRANSPARENT) !=

       bluetooth::hci::ScoCodingFormatValues::TRANSPARENT) !=

      (transmit_coding_format.coding_format_ ==

      (input_coding_format.coding_format_ ==

       bluetooth::hci::ScoCodingFormatValues::TRANSPARENT)) {

       bluetooth::hci::ScoCodingFormatValues::TRANSPARENT)) {

    LOG_INFO(

    LOG_INFO(

        "EnhancedSetupSynchronousConnection: rejected Transmit_Coding_Format "

        "EnhancedSetupSynchronousConnection: rejected Transmit_Coding_Format "
@@ -966,7 +966,7 @@ void DualModeController::EnhancedAcceptSynchronousConnection( 
  // Controller shall not modify the data sent to the Host.

  // Controller shall not modify the data sent to the Host.

  if (receive_coding_format.coding_format_ ==

  if (receive_coding_format.coding_format_ ==

          bluetooth::hci::ScoCodingFormatValues::TRANSPARENT &&

          bluetooth::hci::ScoCodingFormatValues::TRANSPARENT &&

      receive_coding_format.coding_format_ ==

      output_coding_format.coding_format_ ==

          bluetooth::hci::ScoCodingFormatValues::TRANSPARENT &&

          bluetooth::hci::ScoCodingFormatValues::TRANSPARENT &&

      receive_bandwidth != output_bandwidth) {

      receive_bandwidth != output_bandwidth) {

    LOG_INFO(

    LOG_INFO(
@@ -981,7 +981,7 @@ void DualModeController::EnhancedAcceptSynchronousConnection( 
  }

  }

  if ((receive_coding_format.coding_format_ ==

  if ((receive_coding_format.coding_format_ ==

       bluetooth::hci::ScoCodingFormatValues::TRANSPARENT) !=

       bluetooth::hci::ScoCodingFormatValues::TRANSPARENT) !=

      (receive_coding_format.coding_format_ ==

      (output_coding_format.coding_format_ ==

       bluetooth::hci::ScoCodingFormatValues::TRANSPARENT)) {

       bluetooth::hci::ScoCodingFormatValues::TRANSPARENT)) {

    LOG_INFO(

    LOG_INFO(

        "EnhancedSetupSynchronousConnection: rejected Receive_Coding_Format "

        "EnhancedSetupSynchronousConnection: rejected Receive_Coding_Format "