diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2013-05-19 12:49:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-19 12:49:44 -0700 |
| commit | c3de50cd3cff76082bc01b04a8a6bbde300d725e (patch) | |
| tree | 13994688c20972d6faf83522e22ae2f6cf0528bd | |
| parent | c6ab8a614767cae1fc9df5984414c9f15ea7b588 (diff) | |
| parent | 30c798d58772efd595fffebd9d0d54f717e34ed6 (diff) | |
| download | frameworks_base-c3de50cd3cff76082bc01b04a8a6bbde300d725e.zip frameworks_base-c3de50cd3cff76082bc01b04a8a6bbde300d725e.tar.gz frameworks_base-c3de50cd3cff76082bc01b04a8a6bbde300d725e.tar.bz2 | |
am 30c798d5: Merge "Add some temp wifi debugging output" into jb-mr2-dev
* commit '30c798d58772efd595fffebd9d0d54f717e34ed6':
Add some temp wifi debugging output
| -rw-r--r-- | services/java/com/android/server/wifi/WifiController.java | 25 | ||||
| -rw-r--r-- | wifi/java/android/net/wifi/WifiStateMachine.java | 4 |
2 files changed, 23 insertions, 6 deletions
diff --git a/services/java/com/android/server/wifi/WifiController.java b/services/java/com/android/server/wifi/WifiController.java index 52aaac7..10f7f5a 100644 --- a/services/java/com/android/server/wifi/WifiController.java +++ b/services/java/com/android/server/wifi/WifiController.java @@ -147,8 +147,8 @@ class WifiController extends StateMachine { addState(mApEnabledState, mDefaultState); addState(mEcmState, mDefaultState); setInitialState(mApStaDisabledState); - setLogRecSize(25); - setLogOnlyTransitions(true); + setLogRecSize(100); + setLogOnlyTransitions(false); IntentFilter filter = new IntentFilter(); filter.addAction(ACTION_DEVICE_IDLE); @@ -352,7 +352,9 @@ class WifiController extends StateMachine { case CMD_WIFI_TOGGLED: case CMD_AIRPLANE_TOGGLED: case CMD_EMERGENCY_MODE_CHANGED: + break; case CMD_DEFERRED_TOGGLE: + log("DEFERRED_TOGGLE ignored due to state change"); break; default: throw new RuntimeException("WifiController.handleMessage " + msg.what); @@ -409,7 +411,11 @@ class WifiController extends StateMachine { } break; 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)); break; default: @@ -424,6 +430,9 @@ class WifiController extends StateMachine { return false; } + log("WifiController msg " + msg + " deferred for " + + (mReEnableDelayMillis - delaySoFar) + "ms"); + // need to defer this action. Message deferredMsg = obtainMessage(CMD_DEFERRED_TOGGLE); deferredMsg.obj = Message.obtain(msg); @@ -526,7 +535,11 @@ class WifiController extends StateMachine { } break; 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)); break; default: @@ -540,6 +553,10 @@ class WifiController extends StateMachine { if (delaySoFar > mReEnableDelayMillis) { return false; } + + log("WifiController msg " + msg + " deferred for " + + (mReEnableDelayMillis - delaySoFar) + "ms"); + // need to defer this action. Message deferredMsg = obtainMessage(CMD_DEFERRED_TOGGLE); deferredMsg.obj = Message.obtain(msg); diff --git a/wifi/java/android/net/wifi/WifiStateMachine.java b/wifi/java/android/net/wifi/WifiStateMachine.java index 81efd1c..f0b1669 100644 --- a/wifi/java/android/net/wifi/WifiStateMachine.java +++ b/wifi/java/android/net/wifi/WifiStateMachine.java @@ -673,8 +673,8 @@ public class WifiStateMachine extends StateMachine { setInitialState(mInitialState); - setLogRecSize(100); - setLogOnlyTransitions(true); + setLogRecSize(300); + setLogOnlyTransitions(false); if (DBG) setDbg(true); //start the state machine |