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

Commit e887e2b9 authored by Hugo Benichi's avatar Hugo Benichi Committed by Gerrit Code Review
Browse files

Merge "Light refactors to packet wakeup events."

parents d09d106e 2ccba0e0

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -29,7 +29,7 @@ public class WakeupEvent { 
    public String iface;

    public String iface;

    public int uid;

    public int uid;

    public int ethertype;

    public int ethertype;

    public byte[] dstHwAddr;

    public MacAddress dstHwAddr;

    public String srcIp;

    public String srcIp;

    public String dstIp;

    public String dstIp;

    public int ipNextHeader;

    public int ipNextHeader;
@@ -44,7 +44,7 @@ public class WakeupEvent { 
        j.add(iface);

        j.add(iface);

        j.add("uid: " + Integer.toString(uid));

        j.add("uid: " + Integer.toString(uid));

        j.add("eth=0x" + Integer.toHexString(ethertype));

        j.add("eth=0x" + Integer.toHexString(ethertype));

        j.add("dstHw=" + MacAddress.stringAddrFromByteAddr(dstHwAddr));

        j.add("dstHw=" + dstHwAddr);

        if (ipNextHeader > 0) {

        if (ipNextHeader > 0) {

            j.add("ipNxtHdr=" + ipNextHeader);

            j.add("ipNxtHdr=" + ipNextHeader);

            j.add("srcIp=" + srcIp);

            j.add("srcIp=" + srcIp);

core/java/android/net/metrics/WakeupStats.java

+1 −2
Original line number Original line Diff line number Diff line
@@ -16,7 +16,6 @@ 




package android.net.metrics;

package android.net.metrics;





import android.net.MacAddress;

import android.os.Process;

import android.os.Process;

import android.os.SystemClock;

import android.os.SystemClock;

import android.util.SparseIntArray;

import android.util.SparseIntArray;
@@ -80,7 +79,7 @@ public class WakeupStats { 
                break;

                break;

        }

        }





        switch (MacAddress.macAddressType(ev.dstHwAddr)) {

        switch (ev.dstHwAddr.addressType()) {

            case UNICAST:

            case UNICAST:

                l2UnicastCount++;

                l2UnicastCount++;

                break;

                break;

services/core/java/com/android/server/connectivity/NetdEventListenerService.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -21,6 +21,7 @@ import static android.util.TimeUtils.NANOS_PER_MS; 
import android.content.Context;

import android.content.Context;

import android.net.ConnectivityManager;

import android.net.ConnectivityManager;

import android.net.INetdEventCallback;

import android.net.INetdEventCallback;

import android.net.MacAddress;

import android.net.Network;

import android.net.Network;

import android.net.NetworkCapabilities;

import android.net.NetworkCapabilities;

import android.net.metrics.ConnectStats;

import android.net.metrics.ConnectStats;
@@ -242,7 +243,7 @@ public class NetdEventListenerService extends INetdEventListener.Stub { 
        event.timestampMs = timestampMs;

        event.timestampMs = timestampMs;

        event.uid = uid;

        event.uid = uid;

        event.ethertype = ethertype;

        event.ethertype = ethertype;

        event.dstHwAddr = dstHw;

        event.dstHwAddr = new MacAddress(dstHw);

        event.srcIp = srcIp;

        event.srcIp = srcIp;

        event.dstIp = dstIp;

        event.dstIp = dstIp;

        event.ipNextHeader = ipNextHeader;

        event.ipNextHeader = ipNextHeader;