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

Commit 24b6e2bc authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I8de95add,Ia6f4ccfd into nyc-dev 

* changes:
  Remove unused event tags of IpConnectivityEvent
  Better ConnectivityMetricsEvent printing
parents 1415d267 61cbccc2

api/system-current.txt

+12 −36
Original line number Diff line number Diff line
@@ -26057,7 +26057,7 @@ package android.net.http { 








package android.net.metrics {

















  public final class DefaultNetworkEvent extends android.net.metrics.IpConnectivityEvent implements android.os.Parcelable {









  public final class DefaultNetworkEvent implements android.os.Parcelable {









    method public int describeContents();









    method public static void logEvent(int, int[], int, boolean, boolean);









    method public void writeToParcel(android.os.Parcel, int);










@@ -26069,7 +26069,7 @@ package android.net.metrics {







    field public final int[] transportTypes;









  }

















  public final class DhcpClientEvent extends android.net.metrics.IpConnectivityEvent implements android.os.Parcelable {









  public final class DhcpClientEvent implements android.os.Parcelable {









    method public int describeContents();









    method public static void logStateEvent(java.lang.String, java.lang.String);









    method public void writeToParcel(android.os.Parcel, int);










@@ -26078,7 +26078,7 @@ package android.net.metrics {







    field public final java.lang.String msg;









  }

















  public final class DhcpErrorEvent extends android.net.metrics.IpConnectivityEvent implements android.os.Parcelable {









  public final class DhcpErrorEvent implements android.os.Parcelable {









    method public int describeContents();









    method public static int errorCodeWithOption(int, int);









    method public static void logParseError(java.lang.String, int);










@@ -26108,7 +26108,7 @@ package android.net.metrics {







    field public final java.lang.String ifName;









  }

















  public final class DnsEvent extends android.net.metrics.IpConnectivityEvent implements android.os.Parcelable {









  public final class DnsEvent implements android.os.Parcelable {









    method public int describeContents();









    method public static void logEvent(int, byte[], byte[], int[]);









    method public void writeToParcel(android.os.Parcel, int);










@@ -26119,44 +26119,20 @@ package android.net.metrics {







    field public final byte[] returnCodes;









  }

















  public abstract class IpConnectivityEvent {









    ctor public IpConnectivityEvent();









    method public static void logEvent(int, T);









    field public static final int IPCE_CONSRV_BASE = 3072; // 0xc00









    field public static final int IPCE_CONSRV_DEFAULT_NET_CHANGE = 3072; // 0xc00









    field public static final int IPCE_DHCP_BASE = 1024; // 0x400









    field public static final int IPCE_DHCP_PARSE_ERROR = 1025; // 0x401









    field public static final int IPCE_DHCP_RECV_ERROR = 1024; // 0x400









    field public static final int IPCE_DHCP_STATE_CHANGE = 1026; // 0x402









    field public static final int IPCE_DNS_BASE = 5120; // 0x1400









    field public static final int IPCE_DNS_LOOKUPS = 5120; // 0x1400









    field public static final int IPCE_IPMGR_BASE = 4096; // 0x1000









    field public static final int IPCE_IPMGR_COMPLETE_LIFECYCLE = 4098; // 0x1002









    field public static final int IPCE_IPMGR_PROVISIONING_FAIL = 4097; // 0x1001









    field public static final int IPCE_IPMGR_PROVISIONING_OK = 4096; // 0x1000









    field public static final int IPCE_IPRM_BASE = 0; // 0x0









    field public static final int IPCE_IPRM_NUD_FAILED = 2; // 0x2









    field public static final int IPCE_IPRM_PROBE_FAILURE = 1; // 0x1









    field public static final int IPCE_IPRM_PROBE_STARTED = 0; // 0x0









    field public static final int IPCE_IPRM_PROVISIONING_LOST = 3; // 0x3









    field public static final int IPCE_NETMON_BASE = 2048; // 0x800









    field public static final int IPCE_NETMON_CAPPORT_FOUND = 2052; // 0x804









    field public static final int IPCE_NETMON_CHECK_RESULT = 2049; // 0x801









    field public static final int IPCE_NETMON_PORTAL_PROBE = 2051; // 0x803









    field public static final int IPCE_NETMON_STATE_CHANGE = 2048; // 0x800









    field public static final int IPCE_NETMON_VALIDATED = 2050; // 0x802









  }

















  public final class IpManagerEvent extends android.net.metrics.IpConnectivityEvent implements android.os.Parcelable {









  public final class IpManagerEvent implements android.os.Parcelable {









    method public int describeContents();









    method public static void logEvent(int, java.lang.String, long);









    method public void writeToParcel(android.os.Parcel, int);









    field public static final int COMPLETE_LIFECYCLE = 3; // 0x3









    field public static final android.os.Parcelable.Creator<android.net.metrics.IpManagerEvent> CREATOR;









    field public static final int PROVISIONING_FAIL = 2; // 0x2









    field public static final int PROVISIONING_OK = 1; // 0x1









    field public final long durationMs;









    field public final int eventType;









    field public final java.lang.String ifName;









  }

















  public final class IpReachabilityEvent extends android.net.metrics.IpConnectivityEvent implements android.os.Parcelable {









  public final class IpReachabilityEvent implements android.os.Parcelable {









    method public int describeContents();









    method public static void logNudFailed(java.lang.String);









    method public static void logProbeEvent(java.lang.String, int);










@@ -26170,7 +26146,7 @@ package android.net.metrics {







    field public final java.lang.String ifName;









  }

















  public final class NetworkEvent extends android.net.metrics.IpConnectivityEvent implements android.os.Parcelable {









  public final class NetworkEvent implements android.os.Parcelable {









    method public int describeContents();









    method public static void logCaptivePortalFound(int, long);









    method public static void logEvent(int, int);










@@ -26189,7 +26165,7 @@ package android.net.metrics {







    field public final int netId;









  }

















  public final class ValidationProbeEvent extends android.net.metrics.IpConnectivityEvent implements android.os.Parcelable {









  public final class ValidationProbeEvent implements android.os.Parcelable {









    method public int describeContents();









    method public static void logEvent(int, long, int, int);









    method public void writeToParcel(android.os.Parcel, int);

























core/java/android/net/ConnectivityMetricsEvent.java



+2
−2






























Original line number
Diff line number
Diff line







@@ -77,8 +77,8 @@ public final class ConnectivityMetricsEvent implements Parcelable {







    }



















    public String toString() {









        return String.format("ConnectivityMetricsEvent(%d, %d, %d): %s", timestamp,









                componentTag, eventTag, data);









        return String.format("ConnectivityMetricsEvent(%tT.%tL, %d, %d): %s",









                timestamp, timestamp, componentTag, eventTag, data);









    }



















    /** {@hide} */


































core/java/android/net/NetworkCapabilities.java



+19
−11






























Original line number
Diff line number
Diff line







@@ -809,17 +809,7 @@ public final class NetworkCapabilities implements Parcelable {







    @Override









    public String toString() {









        int[] types = getTransportTypes();









        String transports = (types.length > 0 ? " Transports: " : "");









        for (int i = 0; i < types.length;) {









            switch (types[i]) {









                case TRANSPORT_CELLULAR:    transports += "CELLULAR"; break;









                case TRANSPORT_WIFI:        transports += "WIFI"; break;









                case TRANSPORT_BLUETOOTH:   transports += "BLUETOOTH"; break;









                case TRANSPORT_ETHERNET:    transports += "ETHERNET"; break;









                case TRANSPORT_VPN:         transports += "VPN"; break;









            }









            if (++i < types.length) transports += "|";









        }









        String transports = (types.length > 0) ? " Transports: " + transportNamesOf(types) : "";



















        types = getCapabilities();









        String capabilities = (types.length > 0 ? " Capabilities: " : "");










@@ -859,4 +849,22 @@ public final class NetworkCapabilities implements Parcelable {

















        return "[" + transports + capabilities + upBand + dnBand + specifier + signalStrength + "]";









    }



















    /**









     * @hide









     */









    public static String transportNamesOf(int[] types) {









        String transports = "";









        for (int i = 0; i < types.length;) {









            switch (types[i]) {









                case TRANSPORT_CELLULAR:    transports += "CELLULAR"; break;









                case TRANSPORT_WIFI:        transports += "WIFI"; break;









                case TRANSPORT_BLUETOOTH:   transports += "BLUETOOTH"; break;









                case TRANSPORT_ETHERNET:    transports += "ETHERNET"; break;









                case TRANSPORT_VPN:         transports += "VPN"; break;









            }









            if (++i < types.length) transports += "|";









        }









        return transports;









    }









}
























core/java/android/net/metrics/DefaultNetworkEvent.java



+8
−3






























Original line number
Diff line number
Diff line







@@ -17,6 +17,7 @@







package android.net.metrics;



















import android.annotation.SystemApi;









import android.net.NetworkCapabilities;









import android.os.Parcel;









import android.os.Parcelable;




















@@ -65,6 +66,12 @@ public final class DefaultNetworkEvent extends IpConnectivityEvent implements Pa







        return 0;









    }



















    @Override









    public String toString() {









      return String.format("DefaultNetworkEvent(%d -> %d, %s, IPv4: %b, IPv6: %b)", prevNetId,









              netId, NetworkCapabilities.transportNamesOf(transportTypes), prevIPv4, prevIPv6);









    }



















    public static final Parcelable.Creator<DefaultNetworkEvent> CREATOR









        = new Parcelable.Creator<DefaultNetworkEvent>() {









        public DefaultNetworkEvent createFromParcel(Parcel in) {










@@ -78,8 +85,6 @@ public final class DefaultNetworkEvent extends IpConnectivityEvent implements Pa

















    public static void logEvent(









            int netId, int[] transports, int prevNetId, boolean hadIPv4, boolean hadIPv6) {









        final DefaultNetworkEvent ev =









                new DefaultNetworkEvent(netId, transports, prevNetId, hadIPv4, hadIPv6);









        logEvent(IPCE_CONSRV_DEFAULT_NET_CHANGE, ev);









        logEvent(new DefaultNetworkEvent(netId, transports, prevNetId, hadIPv4, hadIPv6));









    }









};
























core/java/android/net/metrics/DhcpClientEvent.java



+6
−1






























Original line number
Diff line number
Diff line







@@ -47,6 +47,11 @@ public final class DhcpClientEvent extends IpConnectivityEvent implements Parcel







        return 0;









    }



















    @Override









    public String toString() {









        return String.format("DhcpClientEvent(%s, %s)", ifName, msg);









    }



















    public static final Parcelable.Creator<DhcpClientEvent> CREATOR









        = new Parcelable.Creator<DhcpClientEvent>() {









        public DhcpClientEvent createFromParcel(Parcel in) {










@@ -59,6 +64,6 @@ public final class DhcpClientEvent extends IpConnectivityEvent implements Parcel







    };



















    public static void logStateEvent(String ifName, String state) {









        logEvent(IPCE_DHCP_STATE_CHANGE, new DhcpClientEvent(ifName, state));









        logEvent(new DhcpClientEvent(ifName, state));









    }









};