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

Commit b700412b authored by Henri Chataing's avatar Henri Chataing Committed by Automerger Merge Worker
Browse files

Merge "RootCanal: Local extended inquiry response sent in inquiry" am: e678637f 

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



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

android/pandora/server/src/com/android/pandora/AndroidInternal.kt

+5 −2
Original line number Original line Diff line number Diff line
@@ -58,7 +58,10 @@ class AndroidInternal(val context: Context) : AndroidImplBase(), Closeable { 
  private val INCOMING_FILE_TITLE = "Incoming file"

  private val INCOMING_FILE_TITLE = "Incoming file"

  private val INCOMING_FILE_WAIT_TIMEOUT = 2000L

  private val INCOMING_FILE_WAIT_TIMEOUT = 2000L





  private val BT_DEVICE_SELECT_WAIT_TIMEOUT = 3000L

  // PTS does not configure the Extended Inquiry Response with the

  // device name; the device will be found after the Inquiry Timeout

  // (12.8sec) has elapsed.

  private val BT_DEVICE_SELECT_WAIT_TIMEOUT = 20000L

  private val IMAGE_FILE_NAME = "OPP_TEST_IMAGE.bmp"

  private val IMAGE_FILE_NAME = "OPP_TEST_IMAGE.bmp"





  private val bluetoothManager = context.getSystemService(BluetoothManager::class.java)!!

  private val bluetoothManager = context.getSystemService(BluetoothManager::class.java)!!
@@ -164,7 +167,7 @@ class AndroidInternal(val context: Context) : AndroidImplBase(), Closeable { 
    var selectJob =

    var selectJob =

      scope.async {

      scope.async {

        device

        device

          .wait(Until.findObject(By.textContains("Cuttlefish")), BT_DEVICE_SELECT_WAIT_TIMEOUT)

          .wait(Until.findObject(By.textContains("PTS")), BT_DEVICE_SELECT_WAIT_TIMEOUT)

          .click()

          .click()

      }

      }

    selectJob.await()

    selectJob.await()

tools/rootcanal/model/controller/link_layer_controller.cc

+1 −1
Original line number Original line Diff line number Diff line
@@ -2765,7 +2765,7 @@ void LinkLayerController::IncomingInquiryResponsePacket( 
              inquiry_response.GetPageScanRepetitionMode()),

              inquiry_response.GetPageScanRepetitionMode()),

          inquiry_response.GetClassOfDevice(),

          inquiry_response.GetClassOfDevice(),

          inquiry_response.GetClockOffset(), inquiry_response.GetRssi(),

          inquiry_response.GetClockOffset(), inquiry_response.GetRssi(),

          extended_inquiry_response_));

          inquiry_response.GetExtendedInquiryResponse()));

    } break;

    } break;

    default:

    default:

      LOG_WARN("Unhandled Incoming Inquiry Response of type %d",

      LOG_WARN("Unhandled Incoming Inquiry Response of type %d",