Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d11d18c0 authored by Michal Karpinski's avatar Michal Karpinski Committed by Robin Lee
Browse files

Rename the DnsEventListenerService to NetdEventListenerService 

The service will be extended to include listening for connect events as well.

Test: this is just a renaming change

Bug: 29748723
Change-Id: I4e50e24d1bfb0b5ead4010cc7df3434d38b753d8
parent 7203d625

services/core/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -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

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

+5 −5
Original line number Diff line number Diff line
@@ -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);

            }

        }

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

+8 −8
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ 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.IpConnectivityLog;

import android.net.metrics.INetdEventListener;

import android.util.Log;



import com.android.internal.annotations.GuardedBy;
@@ -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;