Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8b7d0dc authored by Chien Kun Niu's avatar Chien Kun Niu Committed by Automerger Merge Worker
Browse files

Merge "usb: Correct right USB Gadget HAL Version on resetUsbGadget" into... 

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

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



Change-Id: I40e42261b5c2aff75daaa98eec31729e6f8c19b4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b021b2c8 513fb855

services/usb/java/com/android/server/usb/hal/gadget/UsbGadgetHidl.java

+3 −3
Original line number Diff line number Diff line
@@ -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();

                }

            }