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

Merge "Light refactors to packet wakeup events."

Browse Source
This commit is contained in:
Hugo Benichi
2017-11-22 05:08:50 +00:00
committed by Gerrit Code Review
parent d09d106ec0 2ccba0e0e1
commit e887e2b9c1
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/net/metrics/WakeupEvent.java
View File

@@ -29,7 +29,7 @@ public class WakeupEvent {
public String iface;
public int uid;
public int ethertype;
public byte[] dstHwAddr;
public MacAddress dstHwAddr;
public String srcIp;
public String dstIp;
public int ipNextHeader;
@@ -44,7 +44,7 @@ public class WakeupEvent {
j.add(iface);
j.add("uid: " + Integer.toString(uid));
j.add("eth=0x" + Integer.toHexString(ethertype));
j.add("dstHw=" + MacAddress.stringAddrFromByteAddr(dstHwAddr));
j.add("dstHw=" + dstHwAddr);
if (ipNextHeader > 0) {
j.add("ipNxtHdr=" + ipNextHeader);
j.add("srcIp=" + srcIp);

3
core/java/android/net/metrics/WakeupStats.java
View File

@@ -16,7 +16,6 @@
package android.net.metrics;
import android.net.MacAddress;
import android.os.Process;
import android.os.SystemClock;
import android.util.SparseIntArray;
@@ -80,7 +79,7 @@ public class WakeupStats {
break;
}
switch (MacAddress.macAddressType(ev.dstHwAddr)) {
switch (ev.dstHwAddr.addressType()) {
case UNICAST:
l2UnicastCount++;
break;

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

@@ -21,6 +21,7 @@ import static android.util.TimeUtils.NANOS_PER_MS;
import android.content.Context;
import android.net.ConnectivityManager;
import android.net.INetdEventCallback;
import android.net.MacAddress;
import android.net.Network;
import android.net.NetworkCapabilities;
import android.net.metrics.ConnectStats;
@@ -242,7 +243,7 @@ public class NetdEventListenerService extends INetdEventListener.Stub {
event.timestampMs = timestampMs;
event.uid = uid;
event.ethertype = ethertype;
event.dstHwAddr = dstHw;
event.dstHwAddr = new MacAddress(dstHw);
event.srcIp = srcIp;
event.dstIp = dstIp;
event.ipNextHeader = ipNextHeader;