diff options
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiController.java | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/service/java/com/android/server/wifi/WifiController.java b/service/java/com/android/server/wifi/WifiController.java index 05ce47300..d9afc9f74 100644 --- a/service/java/com/android/server/wifi/WifiController.java +++ b/service/java/com/android/server/wifi/WifiController.java @@ -308,11 +308,7 @@ public class WifiController extends StateMachine { break; case CMD_EMERGENCY_CALL_STATE_CHANGED: case CMD_EMERGENCY_MODE_CHANGED: - boolean configWiFiDisableInECBM = - mFacade.getConfigWiFiDisableInECBM(mContext); - log("WifiController msg " + msg + " getConfigWiFiDisableInECBM " - + configWiFiDisableInECBM); - if ((msg.arg1 == 1) && configWiFiDisableInECBM) { + if (msg.arg1 == 1) { transitionTo(mEcmState); } break; @@ -598,8 +594,15 @@ public class WifiController extends StateMachine { private int mEcmEntryCount; @Override public void enter() { - mWifiStateMachinePrime.shutdownWifi(); - mWifiStateMachine.clearANQPCache(); + mWifiStateMachinePrime.stopSoftAPMode(); + boolean configWiFiDisableInECBM = + mFacade.getConfigWiFiDisableInECBM(mContext); + log("WifiController msg getConfigWiFiDisableInECBM " + + configWiFiDisableInECBM); + if (configWiFiDisableInECBM) { + mWifiStateMachinePrime.shutdownWifi(); + mWifiStateMachine.clearANQPCache(); + } mEcmEntryCount = 1; } |