diff options
| author | Roshan Pius <rpius@google.com> | 2018-08-16 10:51:08 -0700 |
|---|---|---|
| committer | Roshan Pius <rpius@google.com> | 2018-08-28 18:07:37 +0000 |
| commit | 5d99d8f3c9a28e526fbe1ca5d2f7d1e456baf2c7 (patch) | |
| tree | bdf0a7968368aa12f842b2f7cfceedd2102180f6 /service/java/com/android/server/wifi/WifiMonitor.java | |
| parent | 42850d8d6cf94f8b35d5fd925b616cb6fa92cc53 (diff) | |
| download | android_frameworks_opt_net_wifi-5d99d8f3c9a28e526fbe1ca5d2f7d1e456baf2c7.tar.gz android_frameworks_opt_net_wifi-5d99d8f3c9a28e526fbe1ca5d2f7d1e456baf2c7.tar.bz2 android_frameworks_opt_net_wifi-5d99d8f3c9a28e526fbe1ca5d2f7d1e456baf2c7.zip | |
WifiNative: Enable Wifimonitor in scan mode
Even though WifiMonitor was generally designed for handling supplicant
(which is not running in scan mode now) events, there are a couple of
wificond related events using WifiMonitor. Wificond events include scan
completed event. So, even though the scan was completed by wificond, the
events were not getting delivered to WifiScanningService.
Note: This was a regression introduced by ag/4376305. Not sure why this wasn't
caught in the integration tests for that CL.
Bug: 112442032
Test: Unit tests
Test: testWifiManagerScanWhenWifiOffLocationTurnedOn CTS test passes
now.
Change-Id: I961703e54322bbd9748d2816c1c781e3de715c0d
Diffstat (limited to 'service/java/com/android/server/wifi/WifiMonitor.java')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiMonitor.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/service/java/com/android/server/wifi/WifiMonitor.java b/service/java/com/android/server/wifi/WifiMonitor.java index 94e2c18aa..54b1d6bed 100644 --- a/service/java/com/android/server/wifi/WifiMonitor.java +++ b/service/java/com/android/server/wifi/WifiMonitor.java @@ -28,7 +28,6 @@ import android.util.SparseArray; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.Protocol; -import com.android.internal.util.StateMachine; import com.android.server.wifi.hotspot2.AnqpEvent; import com.android.server.wifi.hotspot2.IconEvent; import com.android.server.wifi.hotspot2.WnmData; @@ -39,9 +38,8 @@ import java.util.Map; import java.util.Set; /** - * Listens for events from the wpa_supplicant server, and passes them on - * to the {@link StateMachine} for handling. - * + * Listen for events from the wpa_supplicant & wificond and broadcast them on + * to the various {@link ClientModeImpl} modules interested in handling these events. * @hide */ public class WifiMonitor { |