diff options
| author | 2023-09-28 05:00:30 +0000 | |
|---|---|---|
| committer | 2023-09-28 05:00:30 +0000 | |
| commit | db45188a5b71a115c677f53a9e92cb47b3e7b6c7 (patch) | |
| tree | d38f5a7e0a448c8293f9753ef32ea5488f470c95 | |
| parent | 90787b09fa7915935027469f3decef750ce6f8a0 (diff) | |
| parent | 9da7c8a3932f1ec8124e780cc511a1108a399f8f (diff) | |
Merge "let's at least log the src mac as being the src mac, not the dst" into main am: 9da7c8a393
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2765669
Change-Id: I8fe1adddb5540b1896cdb9a22a96fb95e8deefe2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/android/net/metrics/WakeupEvent.java | 4 |
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); |