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

Commit ff350a2f authored by Naomi Musgrave's avatar Naomi Musgrave Committed by Android (Google) Code Review
Browse files

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

parents fb0152d4 10ae748d

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);

    }