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

Merge "Rename the DnsEventListenerService to NetdEventListenerService"

Browse Source
This commit is contained in:
Michal Karpinski
2016-09-21 08:34:38 +00:00
committed by Gerrit Code Review
parent dfa6e6f186 cc6b37d9e2
commit 1e3f586c10
3 changed files with 12 additions and 12 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/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

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

@@ -55,8 +55,8 @@ public class MetricsLoggerService extends SystemService {
if (DBG) Log.d(TAG, "onBootPhase: PHASE_SYSTEM_SERVICES_READY"); if (DBG) Log.d(TAG, "onBootPhase: PHASE_SYSTEM_SERVICES_READY");
publishBinderService(ConnectivityMetricsLogger.CONNECTIVITY_METRICS_LOGGER_SERVICE, publishBinderService(ConnectivityMetricsLogger.CONNECTIVITY_METRICS_LOGGER_SERVICE,
mBinder); mBinder);
mDnsListener = new DnsEventListenerService(getContext()); mNetdListener = new NetdEventListenerService(getContext());
publishBinderService(mDnsListener.SERVICE_NAME, mDnsListener); publishBinderService(mNetdListener.SERVICE_NAME, mNetdListener);
} }
} }
@@ -91,7 +91,7 @@ public class MetricsLoggerService extends SystemService {
private final ArrayDeque<ConnectivityMetricsEvent> mEvents = new ArrayDeque<>(); private final ArrayDeque<ConnectivityMetricsEvent> mEvents = new ArrayDeque<>();
private DnsEventListenerService mDnsListener; private NetdEventListenerService mNetdListener;
private void enforceConnectivityInternalPermission() { private void enforceConnectivityInternalPermission() {
getContext().enforceCallingOrSelfPermission( getContext().enforceCallingOrSelfPermission(
@@ -223,7 +223,7 @@ public class MetricsLoggerService extends SystemService {
} }
pw.println(); pw.println();
mDnsListener.dump(pw); mNetdListener.dump(pw);
} }
public long logEvent(ConnectivityMetricsEvent event) { public long logEvent(ConnectivityMetricsEvent event) {

14
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;
import android.net.ConnectivityManager.NetworkCallback; 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.IDnsEventListener; import android.net.metrics.INetdEventListener;
import android.util.Log; import android.util.Log;
import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.GuardedBy;
@@ -35,13 +35,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;
@@ -106,7 +106,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();
@@ -115,7 +115,7 @@ public class DnsEventListenerService extends IDnsEventListener.Stub {
} }
}; };
public DnsEventListenerService(Context context) { public NetdEventListenerService(Context context) {
// 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.
final NetworkRequest request = new NetworkRequest.Builder() final NetworkRequest request = new NetworkRequest.Builder()
.clearCapabilities() .clearCapabilities()