Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add getInterfaceVersion to NetdEventListener"

Browse Source 
am: 1c6fb830c3

Change-Id: Iad0ff46434519256a282c93ad51c5e2005a3c24e
This commit is contained in:
Remi NGUYEN VAN
2019-05-22 21:09:38 -07:00
committed by android-build-merger
parent b73b57577a 1c6fb830c3
commit dbd81feb0a
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/connectivity/NetdEventListenerService.java
View File

@@ -27,21 +27,19 @@ import android.net.NetworkCapabilities;
import android.net.metrics.ConnectStats; import android.net.metrics.ConnectStats;
import android.net.metrics.DnsEvent; import android.net.metrics.DnsEvent;
import android.net.metrics.INetdEventListener; import android.net.metrics.INetdEventListener;
import android.net.metrics.IpConnectivityLog;
import android.net.metrics.NetworkMetrics; import android.net.metrics.NetworkMetrics;
import android.net.metrics.WakeupEvent; import android.net.metrics.WakeupEvent;
import android.net.metrics.WakeupStats; import android.net.metrics.WakeupStats;
import android.os.RemoteException; import android.os.RemoteException;
import android.text.format.DateUtils; import android.text.format.DateUtils;
import android.util.Log;
import android.util.ArrayMap; import android.util.ArrayMap;
import android.util.Log;
import android.util.SparseArray; import android.util.SparseArray;
import android.util.StatsLog; import android.util.StatsLog;
import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.BitUtils; import com.android.internal.util.BitUtils;
import com.android.internal.util.IndentingPrintWriter;
import com.android.internal.util.RingBuffer; import com.android.internal.util.RingBuffer;
import com.android.internal.util.TokenBucket; import com.android.internal.util.TokenBucket;
import com.android.server.connectivity.metrics.nano.IpConnectivityLogClass.IpConnectivityEvent; 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) { private void addWakeupEvent(WakeupEvent event) {
String iface = event.iface; String iface = event.iface;
mWakeupEvents.append(event); mWakeupEvents.append(event);