summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Montoir <gmontoir@google.com>2023-04-12 14:29:34 +0800
committerGregory Montoir <gmontoir@google.com>2023-04-13 04:16:10 +0000
commit0c744a960efddf31e542b95610ad4cbdb8759930 (patch)
tree5125ecda964b3f3bacf7ff1dbb4d2b6a2681f124
parent8d28e51babe2c3edff32aceb60876cd705de740d (diff)
downloadhal-0c744a960efddf31e542b95610ad4cbdb8759930.tar.gz
Update VtsHalUsbGadgetV1_1 and HalUsbGadgetV1_0 HAL checkandroid12-tests-dev
Similar to b/235686064, lshal may issue warnings. Ensure the HAL is in the output to judge if the test should be ran. Bug: 258143586 Change-Id: Ifc515557fa066f6b3693211ca567f8675f9820a2
-rw-r--r--usb/gadget/V1_0/host/src/com/android/tests/usbgadget/HalUsbGadgetV1_0HostTest.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/usb/gadget/V1_0/host/src/com/android/tests/usbgadget/HalUsbGadgetV1_0HostTest.java b/usb/gadget/V1_0/host/src/com/android/tests/usbgadget/HalUsbGadgetV1_0HostTest.java
index d6602c99..a3d64540 100644
--- a/usb/gadget/V1_0/host/src/com/android/tests/usbgadget/HalUsbGadgetV1_0HostTest.java
+++ b/usb/gadget/V1_0/host/src/com/android/tests/usbgadget/HalUsbGadgetV1_0HostTest.java
@@ -55,7 +55,7 @@ public class HalUsbGadgetV1_0HostTest extends BaseHostJUnit4Test {
testInfo.getDevice()
.executeShellCommand(String.format("lshal | grep \"%s\"", HAL_SERVICE))
.trim();
- mHasService = !Strings.isNullOrEmpty(serviceFound);
+ mHasService = !Strings.isNullOrEmpty(serviceFound) && serviceFound.contains(HAL_SERVICE);
if (mHasService) {
mUsb = (IUsbNative) Native.loadLibrary("usb-1.0", IUsbNative.class);