WiFi: SAR: Cleanup dead code

In previous commits, new SAR functionality was added to support
handling of the SAR sensor. As part of the migration towards the new
functionality, some old code was kept.

This commit removes this old code (currently unused).

Bug: 65174506
Test: Run Wifi unit test suite
Test: ./frameworks/opt/net/wifi/tests/wifitests/runtests.sh

Change-Id: I2f9a789f0ae464e812c87a7c3c02c1955333a7a1
Signed-off-by: Ahmed ElArabawy <arabawy@google.com>

1 files changed, 0 insertions, 74 deletions

diff --git a/tests/wifitests/src/com/android/server/wifi/WifiVendorHalTest.java b/tests/wifitests/src/com/android/server/wifi/WifiVendorHalTest.java
index 60b5f81ad..fc030b83c 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiVendorHalTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiVendorHalTest.java
@@ -2000,80 +2000,6 @@ public class WifiVendorHalTest {
     }
 
     /**
-     * TODO: This test will be removed in a following change
-     *       It is going to be replaced by another test using the new structure
-     *
-     * Test the new selectTxPowerScenario HIDL method invocation. This should return failure if the
-     * HAL service is exposing the 1.0 interface.
-     */
-    @Test
-    public void testSelectTxPowerScenario_old() throws RemoteException {
-        assertTrue(mWifiVendorHal.startVendorHalSta());
-        // Should fail because we exposed the 1.0 IWifiChip.
-        assertFalse(
-                mWifiVendorHal.selectTxPowerScenario(WifiNative.TX_POWER_SCENARIO_VOICE_CALL));
-        verify(mIWifiChipV11, never()).selectTxPowerScenario(anyInt());
-        mWifiVendorHal.stopVendorHal();
-
-        // Now expose the 1.1 IWifiChip.
-        mWifiVendorHal = new WifiVendorHalSpyV1_1(mHalDeviceManager, mLooper.getLooper());
-        when(mIWifiChipV11.selectTxPowerScenario(anyInt())).thenReturn(mWifiStatusSuccess);
-
-        assertTrue(mWifiVendorHal.startVendorHalSta());
-        assertTrue(
-                mWifiVendorHal.selectTxPowerScenario(WifiNative.TX_POWER_SCENARIO_VOICE_CALL));
-        verify(mIWifiChipV11).selectTxPowerScenario(
-                eq(android.hardware.wifi.V1_1.IWifiChip.TxPowerScenario.VOICE_CALL));
-        verify(mIWifiChipV11, never()).resetTxPowerScenario();
-        mWifiVendorHal.stopVendorHal();
-    }
-
-    /**
-     * TODO: This test will be removed in a following change
-     *       It is going to be replaced by another test using the new structure
-     *
-     * Test the new resetTxPowerScenario HIDL method invocation. This should return failure if the
-     * HAL service is exposing the 1.0 interface.
-     */
-    @Test
-    public void testResetTxPowerScenario_old() throws RemoteException {
-        assertTrue(mWifiVendorHal.startVendorHalSta());
-        // Should fail because we exposed the 1.0 IWifiChip.
-        assertFalse(mWifiVendorHal.selectTxPowerScenario(WifiNative.TX_POWER_SCENARIO_NORMAL));
-        verify(mIWifiChipV11, never()).resetTxPowerScenario();
-        mWifiVendorHal.stopVendorHal();
-
-        // Now expose the 1.1 IWifiChip.
-        mWifiVendorHal = new WifiVendorHalSpyV1_1(mHalDeviceManager, mLooper.getLooper());
-        when(mIWifiChipV11.resetTxPowerScenario()).thenReturn(mWifiStatusSuccess);
-
-        assertTrue(mWifiVendorHal.startVendorHalSta());
-        assertTrue(mWifiVendorHal.selectTxPowerScenario(WifiNative.TX_POWER_SCENARIO_NORMAL));
-        verify(mIWifiChipV11).resetTxPowerScenario();
-        verify(mIWifiChipV11, never()).selectTxPowerScenario(anyInt());
-        mWifiVendorHal.stopVendorHal();
-    }
-
-    /**
-     * TODO: This test will be removed in a following change
-     *       It is going to be replaced by another test using the new structure
-     *
-     * Test the new selectTxPowerScenario HIDL method invocation with a bad scenario index.
-     */
-    @Test
-    public void testInvalidSelectTxPowerScenario_old() throws RemoteException {
-        // Expose the 1.1 IWifiChip.
-        mWifiVendorHal = new WifiVendorHalSpyV1_1(mHalDeviceManager, mLooper.getLooper());
-        when(mIWifiChipV11.selectTxPowerScenario(anyInt())).thenReturn(mWifiStatusSuccess);
-
-        assertTrue(mWifiVendorHal.startVendorHalSta());
-        assertFalse(mWifiVendorHal.selectTxPowerScenario(-6));
-        verify(mIWifiChipV11, never()).selectTxPowerScenario(anyInt());
-        verify(mIWifiChipV11, never()).resetTxPowerScenario();
-        mWifiVendorHal.stopVendorHal();
-    }
-
-    /**
      * Test the selectTxPowerScenario HIDL method invocation for 1.0 interface.
      * This should return failure since SAR is not supported for this interface version.
      */