commit 16a33074d8e38cf3d082c68e972a0e12fb2ad09f
author Michal Karpinski <mkarpinski@google.com> Wed Sep 21 08:47:59 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Sep 21 08:47:59 2016 +0000
tree 5629afa73bc759151c430788271222f3432b7876
parent 0eb01572eec821fb8eb49c09bdb74821aa740552
parent e2f613871041b0356cc99a681d527557998fb072

Merge "Rename the DnsEventListenerService to NetdEventListenerService" am: 1e3f586c10
am: e2f6138710

Change-Id: I001724d2145058df0b51e581855fd663f815c209

services/core/Android.mk

diff --git a/services/core/Android.mk b/services/core/Android.mk
index b965ce3..a5b1069 100644
--- a/services/core/Android.mk
+++ b/services/core/Android.mk
@@ -11,7 +11,7 @@
     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

services/core/java/com/android/server/connectivity/MetricsLoggerService.java

diff --git a/services/core/java/com/android/server/connectivity/MetricsLoggerService.java b/services/core/java/com/android/server/connectivity/MetricsLoggerService.java
index 69ef30f..3675b3e 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 @@
             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 @@
 
     private final ArrayDeque<ConnectivityMetricsEvent> mEvents = new ArrayDeque<>();
 
-    private DnsEventListenerService mDnsListener;
+    private NetdEventListenerService mNetdListener;
 
     private void enforceConnectivityInternalPermission() {
         getContext().enforceCallingOrSelfPermission(
@@ -223,7 +223,7 @@
             }
 
             pw.println();
-            mDnsListener.dump(pw);
+            mNetdListener.dump(pw);
         }
 
         public long logEvent(ConnectivityMetricsEvent event) {

services/core/java/com/android/server/connectivity/NetdEventListenerService.java

diff --git a/services/core/java/com/android/server/connectivity/DnsEventListenerService.java b/services/core/java/com/android/server/connectivity/NetdEventListenerService.java
similarity index 92%
rename from services/core/java/com/android/server/connectivity/DnsEventListenerService.java
rename to services/core/java/com/android/server/connectivity/NetdEventListenerService.java
index 18ab731..98f34ca 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.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 @@
 
 
 /**
- * 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 @@
     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 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()