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

Commit 3db0a14a authored by Michal Karpinski's avatar Michal Karpinski Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE Rename the DnsEventListenerService to... 

Merge "DO NOT MERGE Rename the DnsEventListenerService to NetdEventListenerService" into nyc-mr2-dev
parents e9e77f26 7f9014bb

core/java/android/net/metrics/DnsEvent.java

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ import android.os.Parcel; 
import android.os.Parcelable;



/**

 * An event recorded by DnsEventListenerService.

 * A DNS event recorded by NetdEventListenerService.

 * {@hide}

 */

@SystemApi

services/core/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,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/IpConnectivityMetrics.java

+5 −5
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ final public class IpConnectivityMetrics extends SystemService { 


    @VisibleForTesting

    public final Impl impl = new Impl();

    private DnsEventListenerService mDnsListener;

    private NetdEventListenerService mNetdListener;



    @GuardedBy("mLock")

    private ArrayList<ConnectivityMetricsEvent> mBuffer;
@@ -77,10 +77,10 @@ final public class IpConnectivityMetrics extends SystemService { 
    public void onBootPhase(int phase) {

        if (phase == SystemService.PHASE_SYSTEM_SERVICES_READY) {

            if (DBG) Log.d(TAG, "onBootPhase");

            mDnsListener = new DnsEventListenerService(getContext());

            mNetdListener = new NetdEventListenerService(getContext());



            publishBinderService(SERVICE_NAME, impl);

            publishBinderService(mDnsListener.SERVICE_NAME, mDnsListener);

            publishBinderService(mNetdListener.SERVICE_NAME, mNetdListener);

        }

    }
@@ -169,8 +169,8 @@ final public class IpConnectivityMetrics extends SystemService { 
            pw.println("Buffer capacity: " + mCapacity);

            pw.println("Dropped events: " + mDropped);

        }

        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,7 +22,7 @@ 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.INetdEventListener;

import android.net.metrics.IpConnectivityLog;

import android.util.Log;
@@ -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;

services/tests/servicestests/src/com/android/server/connectivity/DnsEventListenerServiceTest.java→services/tests/servicestests/src/com/android/server/connectivity/NetdEventListenerServiceTest.java

+9 −9
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import android.net.ConnectivityManager.NetworkCallback; 
import android.net.ConnectivityManager;

import android.net.Network;

import android.net.metrics.DnsEvent;

import android.net.metrics.IDnsEventListener;

import android.net.metrics.INetdEventListener;

import android.net.metrics.IpConnectivityLog;



import junit.framework.TestCase;
@@ -47,12 +47,12 @@ import java.util.List; 
import java.util.OptionalInt;

import java.util.stream.IntStream;



public class DnsEventListenerServiceTest extends TestCase {

public class NetdEventListenerServiceTest extends TestCase {



    // TODO: read from DnsEventListenerService after this constant is read from system property

    // TODO: read from NetdEventListenerService after this constant is read from system property

    static final int BATCH_SIZE = 100;

    static final int EVENT_TYPE = IDnsEventListener.EVENT_GETADDRINFO;

    // TODO: read from IDnsEventListener

    static final int EVENT_TYPE = INetdEventListener.EVENT_GETADDRINFO;

    // TODO: read from INetdEventListener

    static final int RETURN_CODE = 1;



    static final byte[] EVENT_TYPES  = new byte[BATCH_SIZE];
@@ -66,7 +66,7 @@ public class DnsEventListenerServiceTest extends TestCase { 
        }

    }



    DnsEventListenerService mDnsService;

    NetdEventListenerService mNetdEventListenerService;



    @Mock ConnectivityManager mCm;

    @Mock IpConnectivityLog mLog;
@@ -77,7 +77,7 @@ public class DnsEventListenerServiceTest extends TestCase { 
        MockitoAnnotations.initMocks(this);

        mCallbackCaptor = ArgumentCaptor.forClass(NetworkCallback.class);

        mEvCaptor = ArgumentCaptor.forClass(DnsEvent.class);

        mDnsService = new DnsEventListenerService(mCm, mLog);

        mNetdEventListenerService = new NetdEventListenerService(mCm, mLog);



        verify(mCm, times(1)).registerNetworkCallback(any(), mCallbackCaptor.capture());

    }
@@ -131,7 +131,7 @@ public class DnsEventListenerServiceTest extends TestCase { 
        new Thread() {

            public void run() {

                while (System.currentTimeMillis() < stop) {

                    mDnsService.dump(pw);

                    mNetdEventListenerService.dump(pw);

                }

            }

        }.start();
@@ -158,7 +158,7 @@ public class DnsEventListenerServiceTest extends TestCase { 


    void log(int netId, int[] latencies) {

        for (int l : latencies) {

            mDnsService.onDnsEvent(netId, EVENT_TYPE, RETURN_CODE, l);

            mNetdEventListenerService.onDnsEvent(netId, EVENT_TYPE, RETURN_CODE, l);

        }

    }