Commit 55e65579 authored by Reilly Grant's avatar Reilly Grant Committed by Commit Bot

[usb] Add temporary logging to debug Android chooser

This change adds temporary info-level log messages around the USB device
chooser implementation on Android in order to diagnose a failure which
is not reproducible on a local build.

Bug: 1041804
No-Presubmit: true
Change-Id: I536f6ae3b88e37f9ebac7def64e918a0b6d6a6ec
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2148295
Commit-Queue: Matt Reynolds <mattreynolds@chromium.org>
Reviewed-by: default avatarMatt Reynolds <mattreynolds@chromium.org>
Auto-Submit: Reilly Grant <reillyg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#759527}
parent 935af04a
......@@ -136,6 +136,7 @@ void UsbChooserDialogAndroid::OnItemSelected(
}
void UsbChooserDialogAndroid::OnDialogCancelled(JNIEnv* env) {
LOG(INFO) << "USB chooser dialog canceled.";
Cancel();
}
......
......@@ -171,6 +171,15 @@ void WebUsbServiceImpl::GetPermission(
return;
}
callback = base::BindOnce(
[&](GetPermissionCallback callback,
device::mojom::UsbDeviceInfoPtr device) {
if (!device)
LOG(INFO) << "Responding to render with no USB device.";
std::move(callback).Run(std::move(device));
},
std::move(callback));
usb_chooser_->GetPermission(std::move(device_filters), std::move(callback));
}
......
......@@ -225,6 +225,10 @@ void USB::OnGetPermission(ScriptPromiseResolver* resolver,
if (service_ && device_info) {
resolver->Resolve(GetOrCreateDevice(std::move(device_info)));
} else {
if (!service_)
LOG(INFO) << "No service connection after requestDevice().";
if (!device_info)
LOG(INFO) << "No device returned from GetPermission() call.";
resolver->Reject(MakeGarbageCollected<DOMException>(
DOMExceptionCode::kNotFoundError, kNoDeviceSelected));
}
......@@ -259,6 +263,7 @@ void USB::OnServiceConnectionError() {
get_devices_requests_.clear();
for (ScriptPromiseResolver* resolver : get_permission_requests_) {
LOG(INFO) << "Rejecting requestDevice() call on service connection error.";
resolver->Reject(MakeGarbageCollected<DOMException>(
DOMExceptionCode::kNotFoundError, kNoDeviceSelected));
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment