diff options
| author | Roshan Pius <rpius@google.com> | 2018-06-29 14:15:39 -0700 |
|---|---|---|
| committer | Michael Plass <mplass@google.com> | 2018-07-02 16:23:48 -0700 |
| commit | a52e9108f44a2770dc7b0ce00bfb4493c3f8e65e (patch) | |
| tree | 6d6c0e1d8bce0029485919b8d5b71feef436ccd4 | |
| parent | a545d80998db04392dfc3566f480041ea18e2bb6 (diff) | |
| download | wifi-pie-dr1-dev.tar.gz | |
WifiController - turn off hotspot in ECMpie-dr1-dev
Bug: 110918088
Test: unit tests
Test: manually verify hotspot is taken down when in ECM
Change-Id: I00830e179c38cefc43c2888de5f2d7b5e871fe60
Merged-In: I00830e179c38cefc43c2888de5f2d7b5e871fe60
| -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; } |