Remove unused event tags of IpConnectivityEvent (61cbccc2) · Commits · e / os / android_frameworks_base

api/system-current.txt

+8 −36

Original line number	Diff line number	Diff line
		@@ -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);

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

+1 −3

Original line number	Diff line number	Diff line
		@@ -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));
		}
		};

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -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));
		}
		};

core/java/android/net/metrics/DhcpErrorEvent.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -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) {

core/java/android/net/metrics/DnsEvent.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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));
		}
		}