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

Commit 10ae748d authored by Naomi Musgrave's avatar Naomi Musgrave
Browse files

Include ID in toString of NetworkEvent subclasses, DNS and Connect event 

Bug: 63910201

Test: runtest --path frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/NetworkEventTest.java
Change-Id: Ie57bc09732e3e3d9f67eee3e8cfe8f5b5f9ecf73
parent 200cd63f

core/java/android/app/admin/ConnectEvent.java

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ public final class ConnectEvent extends NetworkEvent implements Parcelable { 


    @Override

    public String toString() {

        return String.format("ConnectEvent(%s, %d, %d, %s)", mIpAddress, mPort, mTimestamp,

        return String.format("ConnectEvent(%d, %s, %d, %d, %s)", mId, mIpAddress, mPort, mTimestamp,

                mPackageName);

    }

core/java/android/app/admin/DnsEvent.java

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ public final class DnsEvent extends NetworkEvent implements Parcelable { 


    @Override

    public String toString() {

        return String.format("DnsEvent(%s, %s, %d, %d, %s)", mHostname,

        return String.format("DnsEvent(%d, %s, %s, %d, %d, %s)", mId, mHostname,

                (mIpAddresses == null) ? "NONE" : String.join(" ", mIpAddresses),

                mIpAddressesCount, mTimestamp, mPackageName);

    }