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

Commit 0dbf0935 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by android-build-merger
Browse files

Merge "Add getInterfaceVersion to NetdEventListener" am: 1c6fb830 am: dbd81feb am: 9ef856dc 

am: 56f02d8a

Change-Id: I1045c2afd4fbd448edd7f87a9cb40b06c192d8f7
parents b90ec854 56f02d8a

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

+6 −3
Original line number Diff line number Diff line
@@ -27,21 +27,19 @@ import android.net.NetworkCapabilities; 
import android.net.metrics.ConnectStats;

import android.net.metrics.DnsEvent;

import android.net.metrics.INetdEventListener;

import android.net.metrics.IpConnectivityLog;

import android.net.metrics.NetworkMetrics;

import android.net.metrics.WakeupEvent;

import android.net.metrics.WakeupStats;

import android.os.RemoteException;

import android.text.format.DateUtils;

import android.util.Log;

import android.util.ArrayMap;

import android.util.Log;

import android.util.SparseArray;

import android.util.StatsLog;



import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.BitUtils;

import com.android.internal.util.IndentingPrintWriter;

import com.android.internal.util.RingBuffer;

import com.android.internal.util.TokenBucket;

import com.android.server.connectivity.metrics.nano.IpConnectivityLogClass.IpConnectivityEvent;
@@ -307,6 +305,11 @@ public class NetdEventListenerService extends INetdEventListener.Stub { 
        }

    }



    @Override

    public int getInterfaceVersion() throws RemoteException {

        return this.VERSION;

    }



    private void addWakeupEvent(WakeupEvent event) {

        String iface = event.iface;

        mWakeupEvents.append(event);