diff options
| author | 2023-09-28 06:06:50 +0000 | |
|---|---|---|
| committer | 2023-09-28 06:06:50 +0000 | |
| commit | dac5af6f9a479585d15a14bafafa2619890ad93b (patch) | |
| tree | 5db7034c674af7ebafc223885aa8e42447c6aab8 | |
| parent | 7976dd0a584bc10ecfe546deb76625e109d9bd38 (diff) | |
| parent | db45188a5b71a115c677f53a9e92cb47b3e7b6c7 (diff) | |
Merge "let's at least log the src mac as being the src mac, not the dst" into main am: 9da7c8a393 am: db45188a5b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2765669
Change-Id: I67288cafb33d383df4b83569a906d517ab85818f
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); |