Merge "Swap hal query order" into tm-qpr-dev (4c5ec987) · Commits · e / os / android_frameworks_base

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

+4 −5

Original line number	Original line	Diff line number	Diff line
	@@ -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;
	}		}
	}		}