Merge "Add some logging to NDC." into jb-dev (8b18354f) · Commits · e / os / android_frameworks_base

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -148,6 +148,7 @@ final class NativeDaemonConnector implements Runnable, Handler.Callback, Watchdo
		mCallbackHandler.sendMessage(mCallbackHandler.obtainMessage(
		event.getCode(), event.getRawEvent()));
		} else {
		log("POST<- {" + rawEvent + "}");
		mResponseQueue.add(event.getCmdNumber(), event);
		}
		} catch (IllegalArgumentException e) {
		@@ -327,6 +328,7 @@ final class NativeDaemonConnector implements Runnable, Handler.Callback, Watchdo
		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 @@ final class NativeDaemonConnector implements Runnable, Handler.Callback, Watchdo
		throw new NativeDaemonFailureException(logCmd, event);
		}

		log("RTN <- {" + logCmd + "}");
		return events.toArray(new NativeDaemonEvent[events.size()]);
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -166,7 +166,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub
		}

		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.