diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-12-07 17:15:21 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-12-07 17:15:21 -0800 |
| commit | b625fb6993c5f10ba8b68f824e3d344d65dae525 (patch) | |
| tree | 8e0254975e39d8bd1b6f8c71d0e2b8b7238c3691 /service/java/com/android/server/wifi/WifiController.java | |
| parent | 3b56a6aba71e7d666b3f2d6c44389e1187904d73 (diff) | |
| parent | 78ca9b3d6fb28abc6d52a31791f4b4084af76e65 (diff) | |
| download | frameworks_opt_net_wifi-b625fb6993c5f10ba8b68f824e3d344d65dae525.tar.gz frameworks_opt_net_wifi-b625fb6993c5f10ba8b68f824e3d344d65dae525.tar.bz2 frameworks_opt_net_wifi-b625fb6993c5f10ba8b68f824e3d344d65dae525.zip | |
Merge tag 'android-6.0.1_r3' of https://android.googlesource.com/platform/frameworks/opt/net/wifi into base
Android 6.0.1 release 3
Change-Id: I81ecfc8e6509fe6d76a0d5fd0bfaa3dcc11c3a08
Diffstat (limited to 'service/java/com/android/server/wifi/WifiController.java')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiController.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/service/java/com/android/server/wifi/WifiController.java b/service/java/com/android/server/wifi/WifiController.java index 92fc562..58e4882 100644 --- a/service/java/com/android/server/wifi/WifiController.java +++ b/service/java/com/android/server/wifi/WifiController.java @@ -652,6 +652,12 @@ class WifiController extends StateMachine { } } break; + case CMD_EMERGENCY_MODE_CHANGED: + if (msg.arg1 == 1) { + mWifiStateMachine.setHostApRunning(null, false); + transitionTo(mEcmState); + break; + } case CMD_AP_START_FAILURE: if(!mSettingsStore.isScanAlwaysAvailable()) { transitionTo(mApStaDisabledState); @@ -669,6 +675,7 @@ class WifiController extends StateMachine { @Override public void enter() { mWifiStateMachine.setSupplicantRunning(false); + mWifiStateMachine.clearANQPCache(); } @Override |