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

Commit e61d7fbd authored by RD Babiera's avatar RD Babiera Committed by Automerger Merge Worker
Browse files

Merge "Swap hal query order" into tm-qpr-dev am: 4c5ec987 am: 78bf1dad 

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



Change-Id: I81be0f07d6a9a595bfedb982d25f88fb9895238c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bc260613 78bf1dad

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

+4 −5
Original line number Diff line number Diff line
@@ -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;

    }

}