commit e69608f8648e8d7f21c712be3bbf50b05ce8b1e3
author Hugo Benichi <hugobenichi@google.com> Fri Sep 23 14:48:01 2016 +0900
committer Hugo Benichi <hugobenichi@google.com> Fri Sep 23 14:48:01 2016 +0900
tree 9c9ed57193af091d66f75460435f20eb05dfa1e0
parent 4c83ebbc4d4999f4c568e736e9c38a848d475eca
parent 00f07beff9c117fa64b5704dcc24ae4864b2c996

resolve merge conflicts of 00f07be to nyc-mr1-dev-plus-aosp

Change-Id: I82865b2847c584f8a1d728ef76113e3969f222ca

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

diff --git a/services/core/java/com/android/server/connectivity/IpConnectivityMetrics.java b/services/core/java/com/android/server/connectivity/IpConnectivityMetrics.java
index 8f419d8..28e724c 100644
--- a/services/core/java/com/android/server/connectivity/IpConnectivityMetrics.java
+++ b/services/core/java/com/android/server/connectivity/IpConnectivityMetrics.java
@@ -54,6 +54,8 @@
 
     @VisibleForTesting
     public final Impl impl = new Impl();
+    private NetdEventListenerService mNetdListener;
+
     @GuardedBy("mLock")
     private ArrayList<ConnectivityMetricsEvent> mBuffer;
     @GuardedBy("mLock")
@@ -75,8 +77,10 @@
     public void onBootPhase(int phase) {
         if (phase == SystemService.PHASE_SYSTEM_SERVICES_READY) {
             if (DBG) Log.d(TAG, "onBootPhase");
+            mNetdListener = new NetdEventListenerService(getContext());
 
             publishBinderService(SERVICE_NAME, impl);
+            publishBinderService(mNetdListener.SERVICE_NAME, mNetdListener);
         }
     }
 
@@ -165,6 +169,9 @@
             pw.println("Buffer capacity: " + mCapacity);
             pw.println("Dropped events: " + mDropped);
         }
+        if (mNetdListener != null) {
+            mNetdListener.dump(pw);
+        }
     }
 
     private void cmdDefault(FileDescriptor fd, PrintWriter pw, String[] args) {