Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Swap hal query order" into tm-qpr-dev am: 4c5ec9874c

Browse Source 
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>
This commit is contained in:
RD Babiera
2022-08-09 01:13:43 +00:00
committed by Automerger Merge Worker
parent 8125b26831 4c5ec9874c
commit 78bf1dade5
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/usb/java/com/android/server/usb/hal/port/UsbPortHalInstance.java
View File

@@ -31,15 +31,14 @@ public final class UsbPortHalInstance {
public static UsbPortHal getInstance(UsbPortManager portManager, IndentingPrintWriter pw) { public static UsbPortHal getInstance(UsbPortManager portManager, IndentingPrintWriter pw) {
logAndPrint(Log.DEBUG, null, "Querying USB HAL version"); 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)) { if (UsbPortAidl.isServicePresent(null)) {
logAndPrint(Log.INFO, null, "USB HAL AIDL present"); logAndPrint(Log.INFO, null, "USB HAL AIDL present");
return new UsbPortAidl(portManager, pw); return new UsbPortAidl(portManager, pw);
} }
if (UsbPortHidl.isServicePresent(null)) {
logAndPrint(Log.INFO, null, "USB HAL HIDL present");
return new UsbPortHidl(portManager, pw);
}
return null; return null;
} }
} }