summaryrefslogtreecommitdiffstats
path: root/service/java/com/android/server/wifi/WifiMonitor.java
diff options
context:
space:
mode:
authorMitchell Wills <mwills@google.com>2015-11-19 15:45:29 -0800
committerMitchell Wills <mwills@google.com>2015-12-02 13:50:53 -0800
commit18786eca942042388748b0d98979f21c9dff4a89 (patch)
treeed41b3d567c912eba7c6217b96f498c34f29cfd7 /service/java/com/android/server/wifi/WifiMonitor.java
parent2bf6258af8315ac7797dde8646a7cd7ed77b70e2 (diff)
downloadandroid_frameworks_opt_net_wifi-18786eca942042388748b0d98979f21c9dff4a89.tar.gz
android_frameworks_opt_net_wifi-18786eca942042388748b0d98979f21c9dff4a89.tar.bz2
android_frameworks_opt_net_wifi-18786eca942042388748b0d98979f21c9dff4a89.zip
Turn WifiNative into a singleton for each interface
Change-Id: Ida8225c1c8434f5cffbdfd2ebbc4a7b240976a15
Diffstat (limited to 'service/java/com/android/server/wifi/WifiMonitor.java')
-rw-r--r--service/java/com/android/server/wifi/WifiMonitor.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/service/java/com/android/server/wifi/WifiMonitor.java b/service/java/com/android/server/wifi/WifiMonitor.java
index 945901dfb..f48203a6c 100644
--- a/service/java/com/android/server/wifi/WifiMonitor.java
+++ b/service/java/com/android/server/wifi/WifiMonitor.java
@@ -539,7 +539,7 @@ public class WifiMonitor {
public WifiMonitor(StateMachine stateMachine, WifiNative wifiNative) {
if (DBG) Log.d(TAG, "Creating WifiMonitor");
mWifiNative = wifiNative;
- mInterfaceName = wifiNative.mInterfaceName;
+ mInterfaceName = wifiNative.getInterfaceName();
mStateMachine = stateMachine;
mMonitoring = false;
@@ -653,7 +653,7 @@ public class WifiMonitor {
Log.e(TAG, "killSupplicant p2p" + p2pSupported
+ " init.svc.wpa_supplicant=" + suppState
+ " init.svc.p2p_supplicant=" + p2pSuppState);
- WifiNative.killSupplicant(p2pSupported);
+ mWifiNative.killSupplicant(p2pSupported);
mConnected = false;
for (WifiMonitor m : mIfaceMap.values()) {
m.mMonitoring = false;