summaryrefslogtreecommitdiffstats
path: root/wifi
diff options
context:
space:
mode:
authorIrfan Sheriff <isheriff@google.com>2013-03-14 13:26:51 -0700
committerIrfan Sheriff <isheriff@google.com>2013-03-14 14:34:29 -0700
commitb630b7e426aba74bb6064afe5837472efee32363 (patch)
tree07f909ed6d257fa86f4a15c19d95179e716a2c34 /wifi
parente6db500b1050b4040e04926b5473cd6872cf71b4 (diff)
downloadframeworks_base-b630b7e426aba74bb6064afe5837472efee32363.zip
frameworks_base-b630b7e426aba74bb6064afe5837472efee32363.tar.gz
frameworks_base-b630b7e426aba74bb6064afe5837472efee32363.tar.bz2
Fix tether restart on settings change
Bug: 8320043 Change-Id: I35d84c5b0ff2b9cc62d77b7fb6a9b9076f2cb695
Diffstat (limited to 'wifi')
-rw-r--r--wifi/java/android/net/wifi/WifiStateMachine.java9
1 files changed, 6 insertions, 3 deletions
diff --git a/wifi/java/android/net/wifi/WifiStateMachine.java b/wifi/java/android/net/wifi/WifiStateMachine.java
index bb628c8..8cdfe03 100644
--- a/wifi/java/android/net/wifi/WifiStateMachine.java
+++ b/wifi/java/android/net/wifi/WifiStateMachine.java
@@ -3544,7 +3544,8 @@ public class WifiStateMachine extends StateMachine {
if (message.arg1 == mTetherToken) {
loge("Failed to get tether update, shutdown soft access point");
transitionTo(mSoftApStartedState);
- sendMessage(CMD_STOP_AP);
+ // Needs to be first thing handled
+ sendMessageAtFrontOfQueue(CMD_STOP_AP);
}
break;
case CMD_START_SUPPLICANT:
@@ -3609,13 +3610,15 @@ public class WifiStateMachine extends StateMachine {
if (isWifiTethered(stateChange.active)) break;
transitionTo(mSoftApStartedState);
- sendMessage(CMD_STOP_AP);
+ // Needs to be first thing handled
+ sendMessageAtFrontOfQueue(CMD_STOP_AP);
break;
case CMD_TETHER_NOTIFICATION_TIMED_OUT:
if (message.arg1 == mTetherToken) {
loge("Failed to get tether update, force stop access point");
transitionTo(mSoftApStartedState);
- sendMessage(CMD_STOP_AP);
+ // Needs to be first thing handled
+ sendMessageAtFrontOfQueue(CMD_STOP_AP);
}
break;
case CMD_START_SUPPLICANT: