diff options
author | Samip Garg <samgarg@google.com> | 2023-01-16 04:00:03 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-01-16 04:00:03 +0000 |
commit | acb5e8981e9d27d702f65c4c76447aec82162592 (patch) | |
tree | 2bab98f32997fe0a73f94bf7e2bf01581ca62959 | |
parent | a66a1658a3ff50f03f8d96f4f987bd9d8eb1bab6 (diff) | |
parent | 47da2f5893df4892369ee9fb4ea97ab3e5b3d0f0 (diff) | |
download | hal-android13-qpr3-c-s1-release.tar.gz |
Snap tm-dev to android13-tests-dev am: 5dbef63065 am: 47da2f5893android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-release
Original change: https://googleplex-android-review.googlesource.com/c/platform/test/vts-testcase/hal/+/20513832
Change-Id: Ice86b95e971450fc81a31a6dca506ae5cecfe42a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | usb/gadget/V1_0/host/src/com/android/tests/usbgadget/HalUsbGadgetV1_0HostTest.java | 16 | ||||
-rw-r--r-- | usb/gadget/V1_2/host/src/com/android/usb/gadget/vts/VtsHalUsbGadgetV1_2HostTest.java | 2 |
2 files changed, 1 insertions, 17 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 a6974d95..692f79b1 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 @@ -144,20 +144,4 @@ public class HalUsbGadgetV1_0HostTest extends BaseHostJUnit4Test { Thread.sleep(WAIT_TIME); assertTrue("MIDI not present", checkProtocol(1, 3, 0)); } - - /** - * Check for RNDIS. - * - * <p>Enables rndis and checks the host to see if rndis interface is present. RNDIS: - * https://en.wikipedia.org/wiki/RNDIS. - */ - @Test - public void testRndis() throws Exception { - assumeFalse("Skip test: RNDIS support is not required for automotive", - getDevice().hasFeature(FEATURE_AUTOMOTIVE)); - assumeTrue(String.format("The device doesn't have service %s", HAL_SERVICE), mHasService); - getDevice().executeShellCommand("svc usb setFunctions rndis true"); - Thread.sleep(WAIT_TIME); - assertTrue("RNDIS not present", checkProtocol(10, 0, 0)); - } } diff --git a/usb/gadget/V1_2/host/src/com/android/usb/gadget/vts/VtsHalUsbGadgetV1_2HostTest.java b/usb/gadget/V1_2/host/src/com/android/usb/gadget/vts/VtsHalUsbGadgetV1_2HostTest.java index 8a8aafdc..78e77af7 100644 --- a/usb/gadget/V1_2/host/src/com/android/usb/gadget/vts/VtsHalUsbGadgetV1_2HostTest.java +++ b/usb/gadget/V1_2/host/src/com/android/usb/gadget/vts/VtsHalUsbGadgetV1_2HostTest.java @@ -69,7 +69,7 @@ public final class VtsHalUsbGadgetV1_2HostTest 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); |