Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db45188a authored by Maciej Żenczykowski's avatar Maciej Żenczykowski Committed by Automerger Merge Worker
Browse files

Merge "let's at least log the src mac as being the src mac, not the dst" into main am: 9da7c8a3 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2765669



Change-Id: I8fe1adddb5540b1896cdb9a22a96fb95e8deefe2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 90787b09 9da7c8a3

core/java/android/net/metrics/WakeupEvent.java

+2 −2
Original line number Diff line number Diff line
@@ -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);