summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Maciej Żenczykowski <maze@google.com> 2023-09-28 03:35:36 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2023-09-28 03:35:36 +0000
commit9da7c8a3932f1ec8124e780cc511a1108a399f8f (patch)
treeccf3ac0e67a114bdd5f22ed787d54c9d51283314
parent6dbe50e30c9df6cef2f40d053c5f807125c666f6 (diff)
parent92bb8742f9bc61c277dd5fdbf1fae62c1b3698e7 (diff)
Merge "let's at least log the src mac as being the src mac, not the dst" into main
-rw-r--r--core/java/android/net/metrics/WakeupEvent.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/net/metrics/WakeupEvent.java b/core/java/android/net/metrics/WakeupEvent.java
index af9a73ca31ee..53a3ea516530 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 MacAddress dstHwAddr;
+ public MacAddress dstHwAddr; // actually used to store a src mac address
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=" + dstHwAddr);
+ j.add("srcMac=" + dstHwAddr); // really!! http://b/292404319#comment11
if (ipNextHeader > 0) {
j.add("ipNxtHdr=" + ipNextHeader);
j.add("srcIp=" + srcIp);