drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 30c798d5: Merge "Add some temp wifi debugging output" into jb-mr2-dev

Browse Source 
* commit '30c798d58772efd595fffebd9d0d54f717e34ed6':
  Add some temp wifi debugging output
This commit is contained in:
Robert Greenwalt
2013-05-19 12:49:44 -07:00
committed by Android Git Automerger
parent c6ab8a6147 30c798d587
commit c3de50cd3c
2 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
services/java/com/android/server/wifi/WifiController.java
View File

@ -147,8 +147,8 @@ class WifiController extends StateMachine {
addState(mApEnabledState, mDefaultState); addState(mApEnabledState, mDefaultState);
addState(mEcmState, mDefaultState); addState(mEcmState, mDefaultState);
setInitialState(mApStaDisabledState); setInitialState(mApStaDisabledState);
setLogRecSize(25); setLogRecSize(100);
setLogOnlyTransitions(true); setLogOnlyTransitions(false);
IntentFilter filter = new IntentFilter(); IntentFilter filter = new IntentFilter();
filter.addAction(ACTION_DEVICE_IDLE); filter.addAction(ACTION_DEVICE_IDLE);
@ -352,7 +352,9 @@ class WifiController extends StateMachine {
case CMD_WIFI_TOGGLED: case CMD_WIFI_TOGGLED:
case CMD_AIRPLANE_TOGGLED: case CMD_AIRPLANE_TOGGLED:
case CMD_EMERGENCY_MODE_CHANGED: case CMD_EMERGENCY_MODE_CHANGED:
break;
case CMD_DEFERRED_TOGGLE: case CMD_DEFERRED_TOGGLE:
log("DEFERRED_TOGGLE ignored due to state change");
break; break;
default: default:
throw new RuntimeException("WifiController.handleMessage " + msg.what); throw new RuntimeException("WifiController.handleMessage " + msg.what);
@ -409,7 +411,11 @@ class WifiController extends StateMachine {
} }
break; break;
case CMD_DEFERRED_TOGGLE: case CMD_DEFERRED_TOGGLE:
if (msg.arg1 != mDeferredEnableSerialNumber) break; if (msg.arg1 != mDeferredEnableSerialNumber) {
log("DEFERRED_TOGGLE ignored due to serial mismatch");
break;
}
log("DEFERRED_TOGGLE handled");
sendMessage((Message)(msg.obj)); sendMessage((Message)(msg.obj));
break; break;
default: default:
@ -424,6 +430,9 @@ class WifiController extends StateMachine {
return false; return false;
} }
log("WifiController msg " + msg + " deferred for " +
(mReEnableDelayMillis - delaySoFar) + "ms");
// need to defer this action. // need to defer this action.
Message deferredMsg = obtainMessage(CMD_DEFERRED_TOGGLE); Message deferredMsg = obtainMessage(CMD_DEFERRED_TOGGLE);
deferredMsg.obj = Message.obtain(msg); deferredMsg.obj = Message.obtain(msg);
@ -526,7 +535,11 @@ class WifiController extends StateMachine {
} }
break; break;
case CMD_DEFERRED_TOGGLE: case CMD_DEFERRED_TOGGLE:
if (msg.arg1 != mDeferredEnableSerialNumber) break; if (msg.arg1 != mDeferredEnableSerialNumber) {
log("DEFERRED_TOGGLE ignored due to serial mismatch");
break;
}
logd("DEFERRED_TOGGLE handled");
sendMessage((Message)(msg.obj)); sendMessage((Message)(msg.obj));
break; break;
default: default:
@ -540,6 +553,10 @@ class WifiController extends StateMachine {
if (delaySoFar > mReEnableDelayMillis) { if (delaySoFar > mReEnableDelayMillis) {
return false; return false;
} }
log("WifiController msg " + msg + " deferred for " +
(mReEnableDelayMillis - delaySoFar) + "ms");
// need to defer this action. // need to defer this action.
Message deferredMsg = obtainMessage(CMD_DEFERRED_TOGGLE); Message deferredMsg = obtainMessage(CMD_DEFERRED_TOGGLE);
deferredMsg.obj = Message.obtain(msg); deferredMsg.obj = Message.obtain(msg);

4
wifi/java/android/net/wifi/WifiStateMachine.java
View File

@ -673,8 +673,8 @@ public class WifiStateMachine extends StateMachine {
setInitialState(mInitialState); setInitialState(mInitialState);
setLogRecSize(100); setLogRecSize(300);
setLogOnlyTransitions(true); setLogOnlyTransitions(false);
if (DBG) setDbg(true); if (DBG) setDbg(true);
//start the state machine //start the state machine