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

Merge commit '16a33074d8e38cf3d082c68e972a0e12fb2ad09f' into manual_merge_16a3307

Browse Source 
Change-Id: I0d98f0b7f1bd23c00eaa73ff0a48c75cf8f11199
This commit is contained in:
Michal Karpinski
2016-09-21 18:21:17 +09:00
parent bd4ee6e96c 16a33074d8
commit 7e1cdbe1fd
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/Android.mk
View File

@@ -11,7 +11,7 @@ LOCAL_SRC_FILES += \
java/com/android/server/EventLogTags.logtags \
java/com/android/server/am/EventLogTags.logtags \
../../../../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 += \
system/netd/server/binder

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

@@ -56,8 +56,8 @@ public class MetricsLoggerService extends SystemService {
if (DBG) Log.d(TAG, "onBootPhase: PHASE_SYSTEM_SERVICES_READY");
publishBinderService(ConnectivityMetricsLogger.CONNECTIVITY_METRICS_LOGGER_SERVICE,
mBinder);
mDnsListener = new DnsEventListenerService(getContext());
publishBinderService(mDnsListener.SERVICE_NAME, mDnsListener);
mNetdListener = new NetdEventListenerService(getContext());
publishBinderService(mNetdListener.SERVICE_NAME, mNetdListener);
}
}
@@ -86,7 +86,7 @@ public class MetricsLoggerService extends SystemService {
private final ArrayDeque<ConnectivityMetricsEvent> mEvents = new ArrayDeque<>();
private DnsEventListenerService mDnsListener;
private NetdEventListenerService mNetdListener;
private void enforceConnectivityInternalPermission() {
getContext().enforceCallingOrSelfPermission(
@@ -221,8 +221,8 @@ public class MetricsLoggerService extends SystemService {
}
pw.println();
if (mDnsListener != null) {
mDnsListener.dump(pw);
if (mNetdListener != null) {
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.NetworkRequest;
import android.net.metrics.DnsEvent;
import android.net.metrics.IDnsEventListener;
import android.net.metrics.INetdEventListener;
import android.net.metrics.IpConnectivityLog;
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 VDBG = false;
@@ -110,7 +110,7 @@ public class DnsEventListenerService extends IDnsEventListener.Stub {
private final NetworkCallback mNetworkCallback = new NetworkCallback() {
@Override
public void onLost(Network network) {
synchronized (DnsEventListenerService.this) {
synchronized (NetdEventListenerService.this) {
DnsEventBatch batch = mEventBatches.remove(network.netId);
if (batch != null) {
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());
}
@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.
mCm = cm;
mMetricsLog = log;