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

Commit 16fb51d4 authored by Erik Kline's avatar Erik Kline Committed by android-build-merger
Browse files

Merge "Switch to BaseNetdEventCallback instead of interface" into pi-dev 

am: 17761e79

Change-Id: I044767985c07a8018740fd3309e7c9024253382d
parents e5f71abd 17761e79

services/core/java/com/android/server/net/watchlist/NetworkWatchlistService.java

+2 −1
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import com.android.internal.util.DumpUtils; 
import com.android.internal.net.INetworkWatchlistManager;

import com.android.server.ServiceThread;

import com.android.server.SystemService;

import com.android.server.net.BaseNetdEventCallback;



import java.io.FileDescriptor;

import java.io.PrintWriter;
@@ -139,7 +140,7 @@ public class NetworkWatchlistService extends INetworkWatchlistManager.Stub { 
                ServiceManager.getService(IpConnectivityLog.SERVICE_NAME));

    }



    private final INetdEventCallback mNetdEventCallback = new INetdEventCallback.Stub() {

    private final INetdEventCallback mNetdEventCallback = new BaseNetdEventCallback() {

        @Override

        public void onDnsEvent(String hostname, String[] ipAddresses, int ipAddressesCount,

                long timestamp, int uid) {