diff options
| author | Pavel Zhamaitsiak <pavelz@google.com> | 2015-10-20 23:45:18 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-10-20 23:45:18 +0000 |
| commit | 02d8a99ce6c64e6bd4e0e15cd72efe53bf2e7b22 (patch) | |
| tree | 3b99095a9c435bf504255a698954854708747c85 | |
| parent | 25f32f285871054884e52d2a8631a80512241f8b (diff) | |
| parent | 2fd94d6887868f769adc237fd5b9190e3a3569d3 (diff) | |
| download | android_frameworks_opt_net_wifi-02d8a99ce6c64e6bd4e0e15cd72efe53bf2e7b22.tar.gz android_frameworks_opt_net_wifi-02d8a99ce6c64e6bd4e0e15cd72efe53bf2e7b22.tar.bz2 android_frameworks_opt_net_wifi-02d8a99ce6c64e6bd4e0e15cd72efe53bf2e7b22.zip | |
Merge "Disable Portable Wi-Fi hotspot in ECM" into mnc-dr-dev
am: 2fd94d6887
* commit '2fd94d6887868f769adc237fd5b9190e3a3569d3':
Disable Portable Wi-Fi hotspot in ECM
| -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 5b7d89563..9a8967bf2 100644 --- a/service/java/com/android/server/wifi/WifiController.java +++ b/service/java/com/android/server/wifi/WifiController.java @@ -650,6 +650,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); @@ -667,6 +673,7 @@ class WifiController extends StateMachine { @Override public void enter() { mWifiStateMachine.setSupplicantRunning(false); + mWifiStateMachine.clearANQPCache(); } @Override |