Merge "RootCanal: Local extended inquiry response sent in inquiry" (e678637f) · Commits · e / os / android_packages_modules_Bluetooth

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

+5 −2

Original line number	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_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 bluetoothManager = context.getSystemService(BluetoothManager::class.java)!!
		@@ -164,7 +167,7 @@ class AndroidInternal(val context: Context) : AndroidImplBase(), Closeable {
		var selectJob =
		scope.async {
		device
		.wait(Until.findObject(By.textContains("Cuttlefish")), BT_DEVICE_SELECT_WAIT_TIMEOUT)
		.wait(Until.findObject(By.textContains("PTS")), BT_DEVICE_SELECT_WAIT_TIMEOUT)
		.click()
		}
		selectJob.await()

+1 −1

Original line number	Diff line number	Diff line
		@@ -2765,7 +2765,7 @@ void LinkLayerController::IncomingInquiryResponsePacket(
		inquiry_response.GetPageScanRepetitionMode()),
		inquiry_response.GetClassOfDevice(),
		inquiry_response.GetClockOffset(), inquiry_response.GetRssi(),
		extended_inquiry_response_));
		inquiry_response.GetExtendedInquiryResponse()));
		} break;
		default:
		LOG_WARN("Unhandled Incoming Inquiry Response of type %d",