diff --git a/api/system-current.txt b/api/system-current.txt index 3a29848238760..11ae63010bb4f 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -26056,7 +26056,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); @@ -26068,7 +26068,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); @@ -26077,7 +26077,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); @@ -26107,7 +26107,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); @@ -26118,35 +26118,7 @@ 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); @@ -26159,7 +26131,7 @@ package android.net.metrics { 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); @@ -26173,7 +26145,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); @@ -26192,7 +26164,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); diff --git a/core/java/android/net/metrics/DefaultNetworkEvent.java b/core/java/android/net/metrics/DefaultNetworkEvent.java index 1864a1ead8b1c..6138b83fe5b8b 100644 --- a/core/java/android/net/metrics/DefaultNetworkEvent.java +++ b/core/java/android/net/metrics/DefaultNetworkEvent.java @@ -85,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)); } }; diff --git a/core/java/android/net/metrics/DhcpClientEvent.java b/core/java/android/net/metrics/DhcpClientEvent.java index d94473b495eb5..ec560bf64ccc3 100644 --- a/core/java/android/net/metrics/DhcpClientEvent.java +++ b/core/java/android/net/metrics/DhcpClientEvent.java @@ -64,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)); } }; diff --git a/core/java/android/net/metrics/DhcpErrorEvent.java b/core/java/android/net/metrics/DhcpErrorEvent.java index b809209a59d93..84795b89bb6b0 100644 --- a/core/java/android/net/metrics/DhcpErrorEvent.java +++ b/core/java/android/net/metrics/DhcpErrorEvent.java @@ -92,11 +92,11 @@ public final class DhcpErrorEvent extends IpConnectivityEvent implements Parcela }; public static void logParseError(String ifName, int errorCode) { - logEvent(IPCE_DHCP_PARSE_ERROR, new DhcpErrorEvent(ifName, errorCode)); + logEvent(new DhcpErrorEvent(ifName, errorCode)); } public static void logReceiveError(String ifName) { - logEvent(IPCE_DHCP_RECV_ERROR, new DhcpErrorEvent(ifName, RECEIVE_ERROR)); + logEvent(new DhcpErrorEvent(ifName, RECEIVE_ERROR)); } public static int errorCodeWithOption(int errorCode, int option) { diff --git a/core/java/android/net/metrics/DnsEvent.java b/core/java/android/net/metrics/DnsEvent.java index fde3e9e0a19cc..b94dda079cd8e 100644 --- a/core/java/android/net/metrics/DnsEvent.java +++ b/core/java/android/net/metrics/DnsEvent.java @@ -82,6 +82,6 @@ final public class DnsEvent extends IpConnectivityEvent implements Parcelable { public static void logEvent( int netId, byte[] eventTypes, byte[] returnCodes, int[] latenciesMs) { - logEvent(IPCE_DNS_LOOKUPS, new DnsEvent(netId, eventTypes, returnCodes, latenciesMs)); + logEvent(new DnsEvent(netId, eventTypes, returnCodes, latenciesMs)); } } diff --git a/core/java/android/net/metrics/IpConnectivityEvent.java b/core/java/android/net/metrics/IpConnectivityEvent.java index 0b5e3544fe8c6..95576c2853dde 100644 --- a/core/java/android/net/metrics/IpConnectivityEvent.java +++ b/core/java/android/net/metrics/IpConnectivityEvent.java @@ -16,7 +16,6 @@ package android.net.metrics; -import android.annotation.SystemApi; import android.net.ConnectivityMetricsLogger; import android.os.Parcel; import android.os.Parcelable; @@ -24,50 +23,13 @@ import android.os.Parcelable; /** * {@hide} */ -@SystemApi public abstract class IpConnectivityEvent { - // IPRM = IpReachabilityMonitor - // DHCP = DhcpClient - // NETMON = NetworkMonitorEvent - // CONSRV = ConnectivityServiceEvent - // IPMGR = IpManager - // DNS = DnsEvent - public static final int IPCE_IPRM_BASE = 0 * 1024; - public static final int IPCE_DHCP_BASE = 1 * 1024; - public static final int IPCE_NETMON_BASE = 2 * 1024; - public static final int IPCE_CONSRV_BASE = 3 * 1024; - public static final int IPCE_IPMGR_BASE = 4 * 1024; - public static final int IPCE_DNS_BASE = 5 * 1024; + private static final int COMPONENT_TAG = ConnectivityMetricsLogger.COMPONENT_TAG_CONNECTIVITY; - public static final int IPCE_IPRM_PROBE_STARTED = IPCE_IPRM_BASE + 0; - public static final int IPCE_IPRM_PROBE_FAILURE = IPCE_IPRM_BASE + 1; - public static final int IPCE_IPRM_NUD_FAILED = IPCE_IPRM_BASE + 2; - public static final int IPCE_IPRM_PROVISIONING_LOST = IPCE_IPRM_BASE + 3; + private static final ConnectivityMetricsLogger sMetricsLogger = new ConnectivityMetricsLogger(); - public static final int IPCE_DHCP_RECV_ERROR = IPCE_DHCP_BASE + 0; - public static final int IPCE_DHCP_PARSE_ERROR = IPCE_DHCP_BASE + 1; - public static final int IPCE_DHCP_STATE_CHANGE = IPCE_DHCP_BASE + 2; - - public static final int IPCE_NETMON_STATE_CHANGE = IPCE_NETMON_BASE + 0; - public static final int IPCE_NETMON_CHECK_RESULT = IPCE_NETMON_BASE + 1; - public static final int IPCE_NETMON_VALIDATED = IPCE_NETMON_BASE + 2; - public static final int IPCE_NETMON_PORTAL_PROBE = IPCE_NETMON_BASE + 3; - public static final int IPCE_NETMON_CAPPORT_FOUND = IPCE_NETMON_BASE + 4; - - public static final int IPCE_CONSRV_DEFAULT_NET_CHANGE = IPCE_CONSRV_BASE + 0; - - public static final int IPCE_IPMGR_PROVISIONING_OK = IPCE_IPMGR_BASE + 0; - public static final int IPCE_IPMGR_PROVISIONING_FAIL = IPCE_IPMGR_BASE + 1; - public static final int IPCE_IPMGR_COMPLETE_LIFECYCLE = IPCE_IPMGR_BASE + 2; - - public static final int IPCE_DNS_LOOKUPS = IPCE_DNS_BASE + 0; - - private static ConnectivityMetricsLogger mMetricsLogger = new ConnectivityMetricsLogger(); - - public static void logEvent(int tag, T event) { - final long timestamp = System.currentTimeMillis(); - final int componentTag = ConnectivityMetricsLogger.COMPONENT_TAG_CONNECTIVITY; + public static void logEvent(T event) { // TODO: consider using different component for DNS event. - mMetricsLogger.logEvent(timestamp, componentTag, tag, event); + sMetricsLogger.logEvent(System.currentTimeMillis(), COMPONENT_TAG, 0, event); } }; diff --git a/core/java/android/net/metrics/IpManagerEvent.java b/core/java/android/net/metrics/IpManagerEvent.java index fcc76085d6078..0940bd06c3d34 100644 --- a/core/java/android/net/metrics/IpManagerEvent.java +++ b/core/java/android/net/metrics/IpManagerEvent.java @@ -71,7 +71,7 @@ public final class IpManagerEvent extends IpConnectivityEvent implements Parcela }; public static void logEvent(int eventType, String ifName, long durationMs) { - logEvent(IPCE_IPMGR_BASE, new IpManagerEvent(ifName, eventType, durationMs)); + logEvent(new IpManagerEvent(ifName, eventType, durationMs)); } @Override diff --git a/core/java/android/net/metrics/IpReachabilityEvent.java b/core/java/android/net/metrics/IpReachabilityEvent.java index b0eed614303c2..d40389c039867 100644 --- a/core/java/android/net/metrics/IpReachabilityEvent.java +++ b/core/java/android/net/metrics/IpReachabilityEvent.java @@ -72,17 +72,15 @@ public final class IpReachabilityEvent extends IpConnectivityEvent implements Pa }; public static void logProbeEvent(String ifName, int nlErrorCode) { - final int tag = (nlErrorCode == 0) ? IPCE_IPRM_PROBE_STARTED : IPCE_IPRM_PROBE_FAILURE; - final int eventType = PROBE | (nlErrorCode & 0xFF); - logEvent(tag, new IpReachabilityEvent(ifName, eventType)); + logEvent(new IpReachabilityEvent(ifName, PROBE | (nlErrorCode & 0xFF))); } public static void logNudFailed(String ifName) { - logEvent(IPCE_IPRM_NUD_FAILED, new IpReachabilityEvent(ifName, NUD_FAILED)); + logEvent(new IpReachabilityEvent(ifName, NUD_FAILED)); } public static void logProvisioningLost(String ifName) { - logEvent(IPCE_IPRM_PROVISIONING_LOST, new IpReachabilityEvent(ifName, PROVISIONING_LOST)); + logEvent(new IpReachabilityEvent(ifName, PROVISIONING_LOST)); } @Override diff --git a/core/java/android/net/metrics/NetworkEvent.java b/core/java/android/net/metrics/NetworkEvent.java index d3dfa0d60f6ef..08c9c758bbc86 100644 --- a/core/java/android/net/metrics/NetworkEvent.java +++ b/core/java/android/net/metrics/NetworkEvent.java @@ -75,16 +75,15 @@ public final class NetworkEvent extends IpConnectivityEvent implements Parcelabl }; public static void logEvent(int netId, int eventType) { - logEvent(IPCE_NETMON_STATE_CHANGE, new NetworkEvent(netId, eventType, 0)); + logEvent(new NetworkEvent(netId, eventType, 0)); } public static void logValidated(int netId, long durationMs) { - logEvent(IPCE_NETMON_VALIDATED, new NetworkEvent(netId, NETWORK_VALIDATED, durationMs)); + logEvent(new NetworkEvent(netId, NETWORK_VALIDATED, durationMs)); } public static void logCaptivePortalFound(int netId, long durationMs) { - final NetworkEvent ev = new NetworkEvent(netId, NETWORK_CAPTIVE_PORTAL_FOUND, durationMs); - logEvent(IPCE_NETMON_CAPPORT_FOUND, ev); + logEvent(new NetworkEvent(netId, NETWORK_CAPTIVE_PORTAL_FOUND, durationMs)); } @Override diff --git a/core/java/android/net/metrics/ValidationProbeEvent.java b/core/java/android/net/metrics/ValidationProbeEvent.java index 560fd84a1187d..5c8ea65a7c7a7 100644 --- a/core/java/android/net/metrics/ValidationProbeEvent.java +++ b/core/java/android/net/metrics/ValidationProbeEvent.java @@ -74,8 +74,7 @@ public final class ValidationProbeEvent extends IpConnectivityEvent implements P }; public static void logEvent(int netId, long durationMs, int probeType, int returnCode) { - logEvent(IPCE_NETMON_PORTAL_PROBE, - new ValidationProbeEvent(netId, durationMs, probeType, returnCode)); + logEvent(new ValidationProbeEvent(netId, durationMs, probeType, returnCode)); } @Override