Snap for 9495226 from acb5e8981e9d27d702f65c4c76447aec82162592 to tm-qpr3-releaseandroid-13.0.0_r83android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r56android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-release

Change-Id: I191ab3f6594706e94ed45861420f155c375f0e50

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);