diff options
| author | 2022-08-09 01:13:43 +0000 | |
|---|---|---|
| committer | 2022-08-09 01:13:43 +0000 | |
| commit | 78bf1dade5f038d18a1beec741df9ee4b456cc3b (patch) | |
| tree | 3c12b0cb6f898e1f7cecadb060678a651e44b4d4 | |
| parent | 8125b26831d9db6c1f1cc116307081fd7c49c76e (diff) | |
| parent | 4c5ec9874ccde85d261054ebc4a15c380ae5192f (diff) | |
Merge "Swap hal query order" into tm-qpr-dev am: 4c5ec9874c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19533073
Change-Id: I9ae8ce08acdd6e1ee39747dd5feeb936c02bff57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/usb/java/com/android/server/usb/hal/port/UsbPortHalInstance.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/services/usb/java/com/android/server/usb/hal/port/UsbPortHalInstance.java b/services/usb/java/com/android/server/usb/hal/port/UsbPortHalInstance.java index 41f9faef99df..6fc4b6707e9e 100644 --- a/services/usb/java/com/android/server/usb/hal/port/UsbPortHalInstance.java +++ b/services/usb/java/com/android/server/usb/hal/port/UsbPortHalInstance.java @@ -31,15 +31,14 @@ public final class UsbPortHalInstance { public static UsbPortHal getInstance(UsbPortManager portManager, IndentingPrintWriter pw) { logAndPrint(Log.DEBUG, null, "Querying USB HAL version"); - if (UsbPortHidl.isServicePresent(null)) { - logAndPrint(Log.INFO, null, "USB HAL HIDL present"); - return new UsbPortHidl(portManager, pw); - } if (UsbPortAidl.isServicePresent(null)) { logAndPrint(Log.INFO, null, "USB HAL AIDL present"); return new UsbPortAidl(portManager, pw); } - + if (UsbPortHidl.isServicePresent(null)) { + logAndPrint(Log.INFO, null, "USB HAL HIDL present"); + return new UsbPortHidl(portManager, pw); + } return null; } } |