From b838794243078e565f4dfa150c3e9205a6a6f026 Mon Sep 17 00:00:00 2001 From: Chien Kun Niu Date: Mon, 6 Mar 2023 17:38:38 +0800 Subject: [PATCH] usb: Correct right USB Gadget HAL Version on resetUsbGadget Correct USB Gadget HAL Version from V1_2 to V1_1 on resetUsbGadget Bug: 270500209 Test: atest VtsHalUsbGadgetV1_1HostTest atest VtsHalUsbGadgetV1_2HostTest Change-Id: I5315654d3af7c75b7f86e25c5aaf694ac93f3f7d Signed-off-by: Chien Kun Niu --- .../com/android/server/usb/hal/gadget/UsbGadgetHidl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/services/usb/java/com/android/server/usb/hal/gadget/UsbGadgetHidl.java b/services/usb/java/com/android/server/usb/hal/gadget/UsbGadgetHidl.java index 2c5fcb86b0c5d..68067d27a0a56 100644 --- a/services/usb/java/com/android/server/usb/hal/gadget/UsbGadgetHidl.java +++ b/services/usb/java/com/android/server/usb/hal/gadget/UsbGadgetHidl.java @@ -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(); } }