Merge tag 'android-13.0.0_r52' into int/13/fp3
Android 13.0.0 Release 52 (TQ3A.230605.012)
* tag 'android-13.0.0_r52':
Deprecate testRndis as RNDIS is no longer enabled by default in GKI
VtsHalUsbGadgetV1_2HostTest failed during cts test
Change-Id: Ib9b772177d65229a0c3bd4ceb9694e59de21092f
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 a6974d9..692f79b 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 @@
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 8a8aafd..78e77af 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 @@
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);