From 86813d40d7ff519c68c894e3dce32d339a779bc2 Mon Sep 17 00:00:00 2001 From: RD Date: Thu, 4 Aug 2022 22:23:10 +0000 Subject: [PATCH] Swap hal query order USBPortManager now checks for AIDL post-migration, stops redundant error message for HIDL checks Bug: 241042174 Test: Checked to see USBPortManager Error no longer present in System Logcat after order swap Change-Id: I4f0092a68e0cc0dd42dcf2d16f4cdfa646cb72f4 --- .../android/server/usb/hal/port/UsbPortHalInstance.java | 9 ++++----- 1 file 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 41f9faef99dff..6fc4b6707e9e5 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; } }