Merge "usb: Correct right USB Gadget HAL Version on resetUsbGadget" into udc-dev am: 8ab1601f61

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21794250

Change-Id: Ie21ec491a225327582990c12093ae5f37bed64d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chien Kun Niu
2023-03-07 09:33:47 +00:00
committed by Automerger Merge Worker

View File

@@ -191,9 +191,9 @@ public final class UsbGadgetHidl implements UsbGadgetHal {
public void reset(long transactionId) {
try {
synchronized(mGadgetProxyLock) {
if (android.hardware.usb.gadget.V1_2.IUsbGadget.castFrom(mGadgetProxy) != null) {
android.hardware.usb.gadget.V1_2.IUsbGadget gadgetProxy =
android.hardware.usb.gadget.V1_2.IUsbGadget.castFrom(mGadgetProxy);
if (android.hardware.usb.gadget.V1_1.IUsbGadget.castFrom(mGadgetProxy) != null) {
android.hardware.usb.gadget.V1_1.IUsbGadget gadgetProxy =
android.hardware.usb.gadget.V1_1.IUsbGadget.castFrom(mGadgetProxy);
gadgetProxy.reset();
}
}