summaryrefslogtreecommitdiffstats
path: root/wifi/java
diff options
context:
space:
mode:
Diffstat (limited to 'wifi/java')
-rw-r--r--wifi/java/android/net/wifi/WifiStateMachine.java18
1 files changed, 10 insertions, 8 deletions
diff --git a/wifi/java/android/net/wifi/WifiStateMachine.java b/wifi/java/android/net/wifi/WifiStateMachine.java
index 4828700b..7ad2ca8 100644
--- a/wifi/java/android/net/wifi/WifiStateMachine.java
+++ b/wifi/java/android/net/wifi/WifiStateMachine.java
@@ -924,7 +924,9 @@ public class WifiStateMachine extends HierarchicalStateMachine {
}
/**
- * TODO: doc
+ * Request a wakelock with connectivity service to
+ * keep the device awake until we hand-off from wifi
+ * to an alternate network
*/
public void requestCmWakeLock() {
sendMessage(CMD_REQUEST_CM_WAKELOCK);
@@ -2153,13 +2155,6 @@ public class WifiStateMachine extends HierarchicalStateMachine {
transitionTo(mDriverStoppingState);
mWakeLock.release();
break;
- case CMD_REQUEST_CM_WAKELOCK:
- if (mCm == null) {
- mCm = (ConnectivityManager)mContext.getSystemService(
- Context.CONNECTIVITY_SERVICE);
- }
- mCm.requestNetworkTransitionWakelock(TAG);
- break;
case CMD_START_PACKET_FILTERING:
WifiNative.startPacketFiltering();
break;
@@ -2637,6 +2632,13 @@ public class WifiStateMachine extends HierarchicalStateMachine {
sendMessage(CMD_DISCONNECT);
deferMessage(message);
break;
+ case CMD_REQUEST_CM_WAKELOCK:
+ if (mCm == null) {
+ mCm = (ConnectivityManager)mContext.getSystemService(
+ Context.CONNECTIVITY_SERVICE);
+ }
+ mCm.requestNetworkTransitionWakelock(TAG);
+ break;
case CMD_SET_SCAN_MODE:
if (message.arg1 == SCAN_ONLY_MODE) {
sendMessage(CMD_DISCONNECT);