Add some temp wifi debugging output

bug: 9014777
Change-Id: I38c61f235742a36be10cdf9125e19ac9406a61b9

services/java/com/android/server/wifi/WifiController.java

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 @@
             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 @@
                 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 @@
                     }
                     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 @@
                 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 @@
                     }
                     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 @@
             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);

wifi/java/android/net/wifi/WifiStateMachine.java

diff --git a/wifi/java/android/net/wifi/WifiStateMachine.java b/wifi/java/android/net/wifi/WifiStateMachine.java
index 9cae2cb..0fc72d4 100644
--- a/wifi/java/android/net/wifi/WifiStateMachine.java
+++ b/wifi/java/android/net/wifi/WifiStateMachine.java
@@ -673,8 +673,8 @@
 
         setInitialState(mInitialState);
 
-        setLogRecSize(100);
-        setLogOnlyTransitions(true);
+        setLogRecSize(300);
+        setLogOnlyTransitions(false);
         if (DBG) setDbg(true);
 
         //start the state machine