Merge changes from topic 'netd_aosp' (d19524f4) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/connectivity/NetdEventListenerService.java

+11 −1

Original line number	Diff line number	Diff line
		@@ -126,7 +126,9 @@ public class NetdEventListenerService extends INetdEventListener.Stub {

		@Override
		// Called concurrently by multiple binder threads.
		public synchronized void onDnsEvent(int netId, int eventType, int returnCode, int latencyMs) {
		// This method must not block or perform long-running operations.
		public synchronized void onDnsEvent(int netId, int eventType, int returnCode, int latencyMs,
		String hostname, String[] ipAddresses, int ipAddressesCount, int uid) {
		maybeVerboseLog(String.format("onDnsEvent(%d, %d, %d, %d)",
		netId, eventType, returnCode, latencyMs));

		@@ -138,6 +140,14 @@ public class NetdEventListenerService extends INetdEventListener.Stub {
		batch.addResult((byte) eventType, (byte) returnCode, latencyMs);
		}

		@Override
		// Called concurrently by multiple binder threads.
		// This method must not block or perform long-running operations.
		public synchronized void onConnectEvent(int netId, int latencyMs, String ipAddr, int port,
		int uid) {
		maybeVerboseLog(String.format("onConnectEvent(%d, %d)", netId, latencyMs));
		}

		public synchronized void dump(PrintWriter writer) {
		IndentingPrintWriter pw = new IndentingPrintWriter(writer, " ");
		pw.println(TAG + ":");