diff options
| -rw-r--r-- | services/core/Android.mk | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/connectivity/MetricsLoggerService.java | 8 | ||||
| -rw-r--r-- | services/core/java/com/android/server/connectivity/NetdEventListenerService.java (renamed from services/core/java/com/android/server/connectivity/DnsEventListenerService.java) | 14 |
3 files changed, 12 insertions, 12 deletions
diff --git a/services/core/Android.mk b/services/core/Android.mk index b965ce39e7d5..a5b1069974f2 100644 --- a/services/core/Android.mk +++ b/services/core/Android.mk @@ -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 diff --git a/services/core/java/com/android/server/connectivity/MetricsLoggerService.java b/services/core/java/com/android/server/connectivity/MetricsLoggerService.java index 69ef30fbe66a..3675b3e217d2 100644 --- a/services/core/java/com/android/server/connectivity/MetricsLoggerService.java +++ b/services/core/java/com/android/server/connectivity/MetricsLoggerService.java @@ -55,8 +55,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); } } @@ -91,7 +91,7 @@ public class MetricsLoggerService extends SystemService { private final ArrayDeque<ConnectivityMetricsEvent> mEvents = new ArrayDeque<>(); - private DnsEventListenerService mDnsListener; + private NetdEventListenerService mNetdListener; private void enforceConnectivityInternalPermission() { getContext().enforceCallingOrSelfPermission( @@ -223,7 +223,7 @@ public class MetricsLoggerService extends SystemService { } pw.println(); - mDnsListener.dump(pw); + mNetdListener.dump(pw); } public long logEvent(ConnectivityMetricsEvent event) { diff --git a/services/core/java/com/android/server/connectivity/DnsEventListenerService.java b/services/core/java/com/android/server/connectivity/NetdEventListenerService.java index 18ab73100b81..98f34ca11f71 100644 --- a/services/core/java/com/android/server/connectivity/DnsEventListenerService.java +++ b/services/core/java/com/android/server/connectivity/NetdEventListenerService.java @@ -22,7 +22,7 @@ import android.net.ConnectivityManager; import android.net.ConnectivityManager.NetworkCallback; import android.net.Network; import android.net.NetworkRequest; -import android.net.metrics.IDnsEventListener; +import android.net.metrics.INetdEventListener; import android.util.Log; 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 VDBG = false; @@ -106,7 +106,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(); @@ -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. final NetworkRequest request = new NetworkRequest.Builder() .clearCapabilities() |