summaryrefslogtreecommitdiff
path: root/service
diff options
context:
space:
mode:
authorPeter Qiu <zqiu@google.com>2016-02-24 22:48:47 +0000
committerAndroid Partner Code Review <android-gerrit-partner@google.com>2016-02-24 22:48:47 +0000
commit303373e71a6f4474b22cc21a3e4282b563cf2a93 (patch)
tree843963565550bae0717f7e378158a14a3c5fe2d9 /service
parentfbeef71cf8251d4537f1ba65484f39d78c14b81b (diff)
parentdf21baf692e4906c26ce5ab38fa24904787807b5 (diff)
Merge "WifiController: handle WiFi toggle events in ApEnabledState" into mm-wireless-dev
Diffstat (limited to 'service')
-rw-r--r--service/java/com/android/server/wifi/WifiController.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/service/java/com/android/server/wifi/WifiController.java b/service/java/com/android/server/wifi/WifiController.java
index 6827419b7..0b739d3a5 100644
--- a/service/java/com/android/server/wifi/WifiController.java
+++ b/service/java/com/android/server/wifi/WifiController.java
@@ -674,6 +674,12 @@ class WifiController extends StateMachine {
mPendingState = mApStaDisabledState;
}
break;
+ case CMD_WIFI_TOGGLED:
+ if (mSettingsStore.isWifiToggleEnabled()) {
+ mWifiStateMachine.setHostApRunning(null, false);
+ mPendingState = mStaEnabledState;
+ }
+ break;
case CMD_SET_AP:
if (msg.arg1 == 0) {
mWifiStateMachine.setHostApRunning(null, false);