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

Merge "DO NOT MERGE Rename the DnsEventListenerService to NetdEventListenerService" into nyc-mr2-dev

Browse Source
This commit is contained in:
Michal Karpinski
2016-12-02 09:26:26 +00:00
committed by Android (Google) Code Review
parent e9e77f2603 7f9014bb9d
commit 3db0a14ab0
5 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/net/metrics/DnsEvent.java
View File

@@ -21,7 +21,7 @@ import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
/** /**
* An event recorded by DnsEventListenerService. * A DNS event recorded by NetdEventListenerService.
* {@hide} * {@hide}
*/ */
@SystemApi @SystemApi

2
services/core/Android.mk
View File

@@ -12,7 +12,7 @@ LOCAL_SRC_FILES += \
java/com/android/server/EventLogTags.logtags \ java/com/android/server/EventLogTags.logtags \
java/com/android/server/am/EventLogTags.logtags \ java/com/android/server/am/EventLogTags.logtags \
../../../../system/netd/server/binder/android/net/INetd.aidl \ ../../../../system/netd/server/binder/android/net/INetd.aidl \
../../../../system/netd/server/binder/android/net/metrics/IDnsEventListener.aidl \ ../../../../system/netd/server/binder/android/net/metrics/INetdEventListener.aidl \
LOCAL_AIDL_INCLUDES += \ LOCAL_AIDL_INCLUDES += \
system/netd/server/binder system/netd/server/binder

10
services/core/java/com/android/server/connectivity/IpConnectivityMetrics.java
View File

@@ -54,7 +54,7 @@ final public class IpConnectivityMetrics extends SystemService {
@VisibleForTesting @VisibleForTesting
public final Impl impl = new Impl(); public final Impl impl = new Impl();
private DnsEventListenerService mDnsListener; private NetdEventListenerService mNetdListener;
@GuardedBy("mLock") @GuardedBy("mLock")
private ArrayList<ConnectivityMetricsEvent> mBuffer; private ArrayList<ConnectivityMetricsEvent> mBuffer;
@@ -77,10 +77,10 @@ final public class IpConnectivityMetrics extends SystemService {
public void onBootPhase(int phase) { public void onBootPhase(int phase) {
if (phase == SystemService.PHASE_SYSTEM_SERVICES_READY) { if (phase == SystemService.PHASE_SYSTEM_SERVICES_READY) {
if (DBG) Log.d(TAG, "onBootPhase"); if (DBG) Log.d(TAG, "onBootPhase");
mDnsListener = new DnsEventListenerService(getContext()); mNetdListener = new NetdEventListenerService(getContext());
publishBinderService(SERVICE_NAME, impl); publishBinderService(SERVICE_NAME, impl);
publishBinderService(mDnsListener.SERVICE_NAME, mDnsListener); publishBinderService(mNetdListener.SERVICE_NAME, mNetdListener);
} }
} }
@@ -169,8 +169,8 @@ final public class IpConnectivityMetrics extends SystemService {
pw.println("Buffer capacity: " + mCapacity); pw.println("Buffer capacity: " + mCapacity);
pw.println("Dropped events: " + mDropped); pw.println("Dropped events: " + mDropped);
} }
if (mDnsListener != null) { if (mNetdListener != null) {
mDnsListener.dump(pw); mNetdListener.dump(pw);
} }
} }

16
services/core/java/com/android/server/connectivity/DnsEventListenerService.java → services/core/java/com/android/server/connectivity/NetdEventListenerService.java
View File

@@ -22,7 +22,7 @@ import android.net.ConnectivityManager.NetworkCallback;
import android.net.Network; import android.net.Network;
import android.net.NetworkRequest; import android.net.NetworkRequest;
import android.net.metrics.DnsEvent; import android.net.metrics.DnsEvent;
import android.net.metrics.IDnsEventListener; import android.net.metrics.INetdEventListener;
import android.net.metrics.IpConnectivityLog; import android.net.metrics.IpConnectivityLog;
import android.util.Log; import android.util.Log;
@@ -37,13 +37,13 @@ import java.util.TreeMap;
/** /**
* Implementation of the IDnsEventListener interface. * Implementation of the INetdEventListener interface.
*/ */
public class DnsEventListenerService extends IDnsEventListener.Stub { public class NetdEventListenerService extends INetdEventListener.Stub {
public static final String SERVICE_NAME = "dns_listener"; public static final String SERVICE_NAME = "netd_listener";
private static final String TAG = DnsEventListenerService.class.getSimpleName(); private static final String TAG = NetdEventListenerService.class.getSimpleName();
private static final boolean DBG = true; private static final boolean DBG = true;
private static final boolean VDBG = false; private static final boolean VDBG = false;
@@ -110,7 +110,7 @@ public class DnsEventListenerService extends IDnsEventListener.Stub {
private final NetworkCallback mNetworkCallback = new NetworkCallback() { private final NetworkCallback mNetworkCallback = new NetworkCallback() {
@Override @Override
public void onLost(Network network) { public void onLost(Network network) {
synchronized (DnsEventListenerService.this) { synchronized (NetdEventListenerService.this) {
DnsEventBatch batch = mEventBatches.remove(network.netId); DnsEventBatch batch = mEventBatches.remove(network.netId);
if (batch != null) { if (batch != null) {
batch.logAndClear(); batch.logAndClear();
@@ -119,12 +119,12 @@ public class DnsEventListenerService extends IDnsEventListener.Stub {
} }
}; };
public DnsEventListenerService(Context context) { public NetdEventListenerService(Context context) {
this(context.getSystemService(ConnectivityManager.class), new IpConnectivityLog()); this(context.getSystemService(ConnectivityManager.class), new IpConnectivityLog());
} }
@VisibleForTesting @VisibleForTesting
public DnsEventListenerService(ConnectivityManager cm, IpConnectivityLog log) { public NetdEventListenerService(ConnectivityManager cm, IpConnectivityLog log) {
// We are started when boot is complete, so ConnectivityService should already be running. // We are started when boot is complete, so ConnectivityService should already be running.
mCm = cm; mCm = cm;
mMetricsLog = log; mMetricsLog = log;

18
services/tests/servicestests/src/com/android/server/connectivity/DnsEventListenerServiceTest.java → services/tests/servicestests/src/com/android/server/connectivity/NetdEventListenerServiceTest.java
View File

@@ -20,7 +20,7 @@ import android.net.ConnectivityManager.NetworkCallback;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.Network; import android.net.Network;
import android.net.metrics.DnsEvent; import android.net.metrics.DnsEvent;
import android.net.metrics.IDnsEventListener; import android.net.metrics.INetdEventListener;
import android.net.metrics.IpConnectivityLog; import android.net.metrics.IpConnectivityLog;
import junit.framework.TestCase; import junit.framework.TestCase;
@@ -47,12 +47,12 @@ import java.util.List;
import java.util.OptionalInt; import java.util.OptionalInt;
import java.util.stream.IntStream; import java.util.stream.IntStream;
public class DnsEventListenerServiceTest extends TestCase { public class NetdEventListenerServiceTest extends TestCase {
// TODO: read from DnsEventListenerService after this constant is read from system property // TODO: read from NetdEventListenerService after this constant is read from system property
static final int BATCH_SIZE = 100; static final int BATCH_SIZE = 100;
static final int EVENT_TYPE = IDnsEventListener.EVENT_GETADDRINFO; static final int EVENT_TYPE = INetdEventListener.EVENT_GETADDRINFO;
// TODO: read from IDnsEventListener // TODO: read from INetdEventListener
static final int RETURN_CODE = 1; static final int RETURN_CODE = 1;
static final byte[] EVENT_TYPES = new byte[BATCH_SIZE]; static final byte[] EVENT_TYPES = new byte[BATCH_SIZE];
@@ -66,7 +66,7 @@ public class DnsEventListenerServiceTest extends TestCase {
} }
} }
DnsEventListenerService mDnsService; NetdEventListenerService mNetdEventListenerService;
@Mock ConnectivityManager mCm; @Mock ConnectivityManager mCm;
@Mock IpConnectivityLog mLog; @Mock IpConnectivityLog mLog;
@@ -77,7 +77,7 @@ public class DnsEventListenerServiceTest extends TestCase {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
mCallbackCaptor = ArgumentCaptor.forClass(NetworkCallback.class); mCallbackCaptor = ArgumentCaptor.forClass(NetworkCallback.class);
mEvCaptor = ArgumentCaptor.forClass(DnsEvent.class); mEvCaptor = ArgumentCaptor.forClass(DnsEvent.class);
mDnsService = new DnsEventListenerService(mCm, mLog); mNetdEventListenerService = new NetdEventListenerService(mCm, mLog);
verify(mCm, times(1)).registerNetworkCallback(any(), mCallbackCaptor.capture()); verify(mCm, times(1)).registerNetworkCallback(any(), mCallbackCaptor.capture());
} }
@@ -131,7 +131,7 @@ public class DnsEventListenerServiceTest extends TestCase {
new Thread() { new Thread() {
public void run() { public void run() {
while (System.currentTimeMillis() < stop) { while (System.currentTimeMillis() < stop) {
mDnsService.dump(pw); mNetdEventListenerService.dump(pw);
} }
} }
}.start(); }.start();
@@ -158,7 +158,7 @@ public class DnsEventListenerServiceTest extends TestCase {
void log(int netId, int[] latencies) { void log(int netId, int[] latencies) {
for (int l : latencies) { for (int l : latencies) {
mDnsService.onDnsEvent(netId, EVENT_TYPE, RETURN_CODE, l); mNetdEventListenerService.onDnsEvent(netId, EVENT_TYPE, RETURN_CODE, l);
} }
} }