summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chien Kun Niu <rickyniu@google.com> 2023-03-07 08:56:48 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-03-07 08:56:48 +0000
commit8ab1601f61f9ff4593b49ff12df2a08fb1661760 (patch)
tree7be6f5978a74dbe1132c40140db6f1688a44fc14
parent365efa1166e958f1182c5298beb8109f37b133db (diff)
parentb838794243078e565f4dfa150c3e9205a6a6f026 (diff)
Merge "usb: Correct right USB Gadget HAL Version on resetUsbGadget" into udc-dev
-rw-r--r--services/usb/java/com/android/server/usb/hal/gadget/UsbGadgetHidl.java6
1 files 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 2c5fcb86b0c5..68067d27a0a5 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();
}
}