WifiSupplicantControl: Remove this class (Part 1)

Make WifiSupplicantControl instance part of WifiNative and
expose all the public methods of WifiSupplicantControl in WifiNative.
This is a prelude to removing this class altogether. All of this methods
have been exposed in SupplicantStaIface and WifiNative will use that
once we switch over to HIDL.

Note: Some of the existing methods in WifiSupplicantControl were just
wrappers over WifiNative methods and hence removed them altogether.

Bug: 35421721
Test: Existing unit tests.
Test: Will send for regression tests.
Change-Id: I1c90c8d13bec583ff4b2989c8d62b910c5e73e26

1 files changed, 2 insertions, 4 deletions

diff --git a/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java b/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java
index 1a6b392f9..91862296e 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java
@@ -303,7 +303,6 @@ public class WifiStateMachineTest {
     TestIpManager mTestIpManager;
     TestLooper mLooper;
 
-    @Mock WifiNative mWifiNative;
     @Mock WifiScanner mWifiScanner;
     @Mock SupplicantStateTracker mSupplicantStateTracker;
     @Mock WifiMetrics mWifiMetrics;
@@ -321,7 +320,7 @@ public class WifiStateMachineTest {
     @Mock IBinder mApInterfaceBinder;
     @Mock IBinder mClientInterfaceBinder;
     @Mock WifiConfigManager mWifiConfigManager;
-    @Mock WifiSupplicantControl mWifiSupplicantControl;
+    @Mock WifiNative mWifiNative;
     @Mock WifiConnectivityManager mWifiConnectivityManager;
     @Mock SoftApManager mSoftApManager;
 
@@ -352,7 +351,6 @@ public class WifiStateMachineTest {
                 mock(BaseWifiDiagnostics.class));
         when(mWifiInjector.makeWificond()).thenReturn(mWificond);
         when(mWifiInjector.getWifiConfigManager()).thenReturn(mWifiConfigManager);
-        when(mWifiInjector.getWifiSupplicantControl()).thenReturn(mWifiSupplicantControl);
         when(mWifiInjector.getWifiScanner()).thenReturn(mWifiScanner);
         when(mWifiInjector.getWifiNetworkSelector()).thenReturn(mock(WifiNetworkSelector.class));
         when(mWifiInjector.makeWifiConnectivityManager(any(WifiInfo.class), anyBoolean()))
@@ -367,7 +365,7 @@ public class WifiStateMachineTest {
         when(mWifiNative.getInterfaceName()).thenReturn("mockWlan");
         when(mWifiNative.enableSupplicant()).thenReturn(true);
         when(mWifiNative.disableSupplicant()).thenReturn(true);
-        when(mWifiSupplicantControl.getFrameworkNetworkId(anyInt())).thenReturn(0);
+        when(mWifiNative.getFrameworkNetworkId(anyInt())).thenReturn(0);
 
 
         FrameworkFacade factory = getFrameworkFacade();