Merge "Revert "[HDM] Add API to check for STA+AP concurrency"" into pi-dev

am: 7b0164f58c

Change-Id: I75729b73e550e606c2ef23171d2f2b121faf291c

1 files changed, 0 insertions, 64 deletions

diff --git a/tests/wifitests/src/com/android/server/wifi/HalDeviceManagerTest.java b/tests/wifitests/src/com/android/server/wifi/HalDeviceManagerTest.java
index 7e74e3070..f18c52d39 100644
--- a/tests/wifitests/src/com/android/server/wifi/HalDeviceManagerTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/HalDeviceManagerTest.java
@@ -687,22 +687,6 @@ public class HalDeviceManagerTest {
     //////////////////////////////////////////////////////////////////////////////////////
 
     /**
-     * Validate STA+AP concurrency derivation from chip configuration.
-     */
-    @Test
-    public void testIsConcurrentStaPlusApSupportedChipV1() throws Exception {
-        TestChipV1 chipMock = new TestChipV1();
-        chipMock.initialize();
-        mInOrder = inOrder(mServiceManagerMock, mWifiMock, chipMock.chip,
-                mManagerStatusListenerMock);
-        executeAndValidateInitializationSequence();
-        executeAndValidateStartupSequence();
-
-        assertFalse("STA+AP concurrency should be FALSE for TestChipV1",
-                mDut.isConcurrentStaPlusApSupported());
-    }
-
-    /**
      * Validate creation of AP interface when in STA mode - but with no interface created. Expect
      * a change in chip mode.
      */
@@ -1205,22 +1189,6 @@ public class HalDeviceManagerTest {
     //////////////////////////////////////////////////////////////////////////////////////
 
     /**
-     * Validate STA+AP concurrency derivation from chip configuration.
-     */
-    @Test
-    public void testIsConcurrentStaPlusApSupportedChipV2() throws Exception {
-        TestChipV2 chipMock = new TestChipV2();
-        chipMock.initialize();
-        mInOrder = inOrder(mServiceManagerMock, mWifiMock, chipMock.chip,
-                mManagerStatusListenerMock);
-        executeAndValidateInitializationSequence();
-        executeAndValidateStartupSequence();
-
-        assertTrue("STA+AP concurrency should be TRUE for TestChipV2",
-                mDut.isConcurrentStaPlusApSupported());
-    }
-
-    /**
      * Validate a flow sequence for test chip 2:
      * - create STA
      * - create P2P
@@ -1498,22 +1466,6 @@ public class HalDeviceManagerTest {
     //////////////////////////////////////////////////////////////////////////////////////
 
     /**
-     * Validate STA+AP concurrency derivation from chip configuration.
-     */
-    @Test
-    public void testIsConcurrentStaPlusApSupportedChipV3() throws Exception {
-        TestChipV3 chipMock = new TestChipV3();
-        chipMock.initialize();
-        mInOrder = inOrder(mServiceManagerMock, mWifiMock, chipMock.chip,
-                mManagerStatusListenerMock);
-        executeAndValidateInitializationSequence();
-        executeAndValidateStartupSequence();
-
-        assertTrue("STA+AP concurrency should be TRUE for TestChipV3",
-                mDut.isConcurrentStaPlusApSupported());
-    }
-
-    /**
      * Validate a flow sequence for test chip 3:
      * - create STA
      * - create P2P
@@ -1779,22 +1731,6 @@ public class HalDeviceManagerTest {
     //////////////////////////////////////////////////////////////////////////////////////
 
     /**
-     * Validate STA+AP concurrency derivation from chip configuration.
-     */
-    @Test
-    public void testIsConcurrentStaPlusApSupportedChipV4() throws Exception {
-        TestChipV4 chipMock = new TestChipV4();
-        chipMock.initialize();
-        mInOrder = inOrder(mServiceManagerMock, mWifiMock, chipMock.chip,
-                mManagerStatusListenerMock);
-        executeAndValidateInitializationSequence();
-        executeAndValidateStartupSequence();
-
-        assertTrue("STA+AP concurrency should be TRUE for TestChipV4",
-                mDut.isConcurrentStaPlusApSupported());
-    }
-
-    /**
      * Validate a flow sequence for test chip 4:
      * - create STA
      * - create P2P