Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic 'netd_aosp'

Browse Source 
* changes:
  Add connect event reporting
  Extending DNS event reporting
This commit is contained in:
Lorenzo Colitti
2016-10-27 13:05:25 +00:00
committed by Gerrit Code Review
parent ef0cc62058 265494a0f8
commit d19524f4f2
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/connectivity/NetdEventListenerService.java
View File

@@ -126,7 +126,9 @@ public class NetdEventListenerService extends INetdEventListener.Stub {
@Override @Override
// Called concurrently by multiple binder threads. // 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)", maybeVerboseLog(String.format("onDnsEvent(%d, %d, %d, %d)",
netId, eventType, returnCode, latencyMs)); netId, eventType, returnCode, latencyMs));
@@ -138,6 +140,14 @@ public class NetdEventListenerService extends INetdEventListener.Stub {
batch.addResult((byte) eventType, (byte) returnCode, latencyMs); 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) { public synchronized void dump(PrintWriter writer) {
IndentingPrintWriter pw = new IndentingPrintWriter(writer, " "); IndentingPrintWriter pw = new IndentingPrintWriter(writer, " ");
pw.println(TAG + ":"); pw.println(TAG + ":");