From 01f255bbf34fd0a061dfcb925b443352ece2ee9a Mon Sep 17 00:00:00 2001
From: Ricky Niu <rickyniu@google.com>
Date: Tue, 22 Mar 2022 16:50:42 +0800
Subject: [PATCH] Correct the operationID in resetUsbPort

Fixed the operationID when the operationID collisions, create another key

Bug: 217369748
Signed-off-by: Ricky Niu <rickyniu@google.com>
Change-Id: I22126b4c04b5c92bc9fc9db7405e7ee9d2806b49
---
 .../usb/java/com/android/server/usb/hal/port/UsbPortAidl.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/usb/java/com/android/server/usb/hal/port/UsbPortAidl.java b/services/usb/java/com/android/server/usb/hal/port/UsbPortAidl.java
index 1db018edf7764..8c9e80f7e04df 100644
--- a/services/usb/java/com/android/server/usb/hal/port/UsbPortAidl.java
+++ b/services/usb/java/com/android/server/usb/hal/port/UsbPortAidl.java
@@ -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="