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

Merge changes from topic 'netd-benchmark-and-logging-nyc-mr2-dev' into nyc-mr2-dev

Browse Source 
* changes:
  DO NOT MERGE Add connect event reporting
  DO NOT MERGE Extending DNS event reporting
This commit is contained in:
Michal Karpinski
2016-12-06 10:16:32 +00:00
committed by Android (Google) Code Review
parent f59d4e0a82 c429e71cfe
commit b97196b1de
2 changed files with 13 additions and 2 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

@@ -134,7 +134,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));
@@ -146,6 +148,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 + ":");

3
services/tests/servicestests/src/com/android/server/connectivity/NetdEventListenerServiceTest.java
View File

@@ -158,7 +158,8 @@ public class NetdEventListenerServiceTest extends TestCase {
void log(int netId, int[] latencies) {
for (int l : latencies) {
mNetdEventListenerService.onDnsEvent(netId, EVENT_TYPE, RETURN_CODE, l);
mNetdEventListenerService.onDnsEvent(netId, EVENT_TYPE, RETURN_CODE, l, null, null, 0,
0);
}
}