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

Commit ceb30c44 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Correct the operationID in resetUsbPort" into tm-dev am: 6b1520ab 

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

Change-Id: I29236839c79b26780e216bec54260992db2c499f
parents 15d487fa 6b1520ab

services/usb/java/com/android/server/usb/hal/port/UsbPortAidl.java

+2 −2
Original line number Diff line number Diff line
@@ -296,8 +296,8 @@ public final class UsbPortAidl implements UsbPortHal { 
                            + operationID + " key:" + key);

                }

                try {

                    sCallbacks.put(operationID, callback);

                    mProxy.resetUsbPort(portName, operationID);

                    sCallbacks.put(key, callback);

                    mProxy.resetUsbPort(portName, key);

                } catch (RemoteException e) {

                    logAndPrintException(mPw,

                            "resetUsbPort: Failed to resetUsbPort: portID="