diff options
| author | Hugo Benichi <hugobenichi@google.com> | 2017-11-22 05:27:11 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-11-22 05:27:11 +0000 |
| commit | 90e68c6869ecd864d5ea4944575bad6cdb37265f (patch) | |
| tree | 37dd6c7895de20cf71a70e6492ac311e61869270 /core/java/android | |
| parent | 9f6a3431a1cfa7d46d3e5bb19355d4b307e0c006 (diff) | |
| parent | c6dc6baf4f8e78b96728361e3523feefbb770268 (diff) | |
Merge "Light refactors to packet wakeup events." am: e887e2b9c1
am: c6dc6baf4f
Change-Id: I4c19f1cdfe7a9fb47aad23a21b0aa0ae8e03277a
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/net/metrics/WakeupEvent.java | 4 | ||||
| -rw-r--r-- | core/java/android/net/metrics/WakeupStats.java | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/core/java/android/net/metrics/WakeupEvent.java b/core/java/android/net/metrics/WakeupEvent.java index 8f1a5c42e6ac..af9a73ca31ee 100644 --- a/core/java/android/net/metrics/WakeupEvent.java +++ b/core/java/android/net/metrics/WakeupEvent.java @@ -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); diff --git a/core/java/android/net/metrics/WakeupStats.java b/core/java/android/net/metrics/WakeupStats.java index 1ba97771b595..23c1f20f1a44 100644 --- a/core/java/android/net/metrics/WakeupStats.java +++ b/core/java/android/net/metrics/WakeupStats.java @@ -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; |