Merge "Add some logging to NDC." into jb-dev

Author: Robert Greenwalt

services/java/com/android/server/NativeDaemonConnector.java

@@ -148,6 +148,7 @@ private void listenToSocket() throws IOException {
                                 mCallbackHandler.sendMessage(mCallbackHandler.obtainMessage(
                                         event.getCode(), event.getRawEvent()));
                             } else {
+                                log("POST<- {" + rawEvent + "}");
                                 mResponseQueue.add(event.getCmdNumber(), event);
                             }
                         } catch (IllegalArgumentException e) {
@@ -327,6 +328,7 @@ public NativeDaemonEvent[] execute(int timeout, String cmd, Object... args)
                 loge("timed-out waiting for response to " + logCmd);
                 throw new NativeDaemonFailureException(logCmd, event);
             }
+            log("RMV <- {" + event + "}");
             events.add(event);
         } while (event.isClassContinue());
 
@@ -337,6 +339,7 @@ public NativeDaemonEvent[] execute(int timeout, String cmd, Object... args)
             throw new NativeDaemonFailureException(logCmd, event);
         }
 
+        log("RTN <- {" + logCmd + "}");
         return events.toArray(new NativeDaemonEvent[events.size()]);
     }
 

services/java/com/android/server/NetworkManagementService.java

@@ -166,7 +166,7 @@ private NetworkManagementService(Context context) {
         }
 
         mConnector = new NativeDaemonConnector(
-                new NetdCallbackReceiver(), "netd", 10, NETD_TAG, 50);
+                new NetdCallbackReceiver(), "netd", 10, NETD_TAG, 80);
         mThread = new Thread(mConnector, NETD_TAG);
 
         // Add ourself to the Watchdog monitors.