From 54c9cf8d299b99f8b999bc2cf4adcda1eba81469 Mon Sep 17 00:00:00 2001 From: Glen Kuhne Date: Thu, 17 Mar 2016 16:48:29 -0700 Subject: Remove SupplicantStateTracker dependency on WSM Removed the SST's dependency on WifiStateMachine, since it doesn't use it for anything. BUG=27725788 Change-Id: I209056f8ecc9fe73d184718b86a0b8442e3950ea --- service/java/com/android/server/wifi/FrameworkFacade.java | 4 ++-- service/java/com/android/server/wifi/SupplicantStateTracker.java | 6 +----- service/java/com/android/server/wifi/WifiStateMachine.java | 2 +- .../wifitests/src/com/android/server/wifi/WifiStateMachineTest.java | 2 +- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/service/java/com/android/server/wifi/FrameworkFacade.java b/service/java/com/android/server/wifi/FrameworkFacade.java index dc94d92ec..85dc3e026 100644 --- a/service/java/com/android/server/wifi/FrameworkFacade.java +++ b/service/java/com/android/server/wifi/FrameworkFacade.java @@ -56,8 +56,8 @@ public class FrameworkFacade { } public SupplicantStateTracker makeSupplicantStateTracker(Context context, - WifiStateMachine wifiStateMachine, WifiConfigManager configManager, Handler handler) { - return new SupplicantStateTracker(context, wifiStateMachine, configManager, handler); + WifiConfigManager configManager, Handler handler) { + return new SupplicantStateTracker(context, configManager, handler); } /** diff --git a/service/java/com/android/server/wifi/SupplicantStateTracker.java b/service/java/com/android/server/wifi/SupplicantStateTracker.java index f4001a4ee..a7c21bfed 100644 --- a/service/java/com/android/server/wifi/SupplicantStateTracker.java +++ b/service/java/com/android/server/wifi/SupplicantStateTracker.java @@ -48,8 +48,6 @@ public class SupplicantStateTracker extends StateMachine { private static final String TAG = "SupplicantStateTracker"; private static boolean DBG = false; - - private final WifiStateMachine mWifiStateMachine; private final WifiConfigManager mWifiConfigManager; private final IBatteryStats mBatteryStats; /* Indicates authentication failure in supplicant broadcast. @@ -89,12 +87,10 @@ public class SupplicantStateTracker extends StateMachine { return getCurrentState().getName(); } - public SupplicantStateTracker(Context c, WifiStateMachine wsm, WifiConfigManager wcs, - Handler t) { + public SupplicantStateTracker(Context c, WifiConfigManager wcs, Handler t) { super(TAG, t.getLooper()); mContext = c; - mWifiStateMachine = wsm; mWifiConfigManager = wcs; mBatteryStats = (IBatteryStats)ServiceManager.getService(BatteryStats.SERVICE_NAME); addState(mDefaultState); diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java index bfc0be5f0..07f8780b9 100644 --- a/service/java/com/android/server/wifi/WifiStateMachine.java +++ b/service/java/com/android/server/wifi/WifiStateMachine.java @@ -1160,7 +1160,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.PnoEven mWifiQualifiedNetworkSelector = new WifiQualifiedNetworkSelector(mWifiConfigManager, mContext, mWifiInfo, mClock); mSupplicantStateTracker = mFacade.makeSupplicantStateTracker( - context, this, mWifiConfigManager, getHandler()); + context, mWifiConfigManager, getHandler()); mLinkProperties = new LinkProperties(); diff --git a/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java b/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java index 1cc424553..3b5bfe418 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java @@ -361,7 +361,7 @@ public class WifiStateMachineTest { .thenReturn(mApConfigStore); when(factory.makeSupplicantStateTracker( - any(Context.class), any(WifiStateMachine.class), any(WifiConfigManager.class), + any(Context.class), any(WifiConfigManager.class), any(Handler.class))).thenReturn(mSupplicantStateTracker); when(mUserManager.getProfileParent(11)) -- cgit v1.2.3