Merge "Connectivity metrics: simplify ConnectivityMetricsEvent" (97035b4a) · Commits · e / os / android_frameworks_base

core/java/android/net/ConnectivityMetricsEvent.java

+11 −25

Original line number	Original line	Diff line number	Diff line
	@@ -23,35 +23,24 @@ import android.os.Parcelable;
	public final class ConnectivityMetricsEvent implements Parcelable {		public final class ConnectivityMetricsEvent implements Parcelable {

	/** The time when this event was collected, as returned by System.currentTimeMillis(). */		/** The time when this event was collected, as returned by System.currentTimeMillis(). */
	final public long timestamp;		public long timestamp;

	/** The subsystem that generated the event. One of the COMPONENT_TAG_xxx constants. */
	final public int componentTag;

	/** The subsystem-specific event ID. */
	final public int eventTag;

	/** Opaque event-specific data. */		/** Opaque event-specific data. */
	final public Parcelable data;		public Parcelable data;

			public ConnectivityMetricsEvent() {
			}

	public ConnectivityMetricsEvent(long timestamp, int componentTag,		public ConnectivityMetricsEvent(Parcel in) {
	int eventTag, Parcelable data) {		timestamp = in.readLong();
	this.timestamp = timestamp;		data = in.readParcelable(null);
	this.componentTag = componentTag;
	this.eventTag = eventTag;
	this.data = data;
	}		}

	/** Implement the Parcelable interface */		/** Implement the Parcelable interface */
	public static final Parcelable.Creator<ConnectivityMetricsEvent> CREATOR		public static final Parcelable.Creator<ConnectivityMetricsEvent> CREATOR
	= new Parcelable.Creator<ConnectivityMetricsEvent> (){		= new Parcelable.Creator<ConnectivityMetricsEvent> (){
	public ConnectivityMetricsEvent createFromParcel(Parcel source) {		public ConnectivityMetricsEvent createFromParcel(Parcel source) {
	final long timestamp = source.readLong();		return new ConnectivityMetricsEvent(source);
	final int componentTag = source.readInt();
	final int eventTag = source.readInt();
	final Parcelable data = source.readParcelable(null);
	return new ConnectivityMetricsEvent(timestamp, componentTag,
	eventTag, data);
	}		}

	public ConnectivityMetricsEvent[] newArray(int size) {		public ConnectivityMetricsEvent[] newArray(int size) {
	@@ -59,7 +48,6 @@ public final class ConnectivityMetricsEvent implements Parcelable {
	}		}
	};		};

	/** Implement the Parcelable interface */
	@Override		@Override
	public int describeContents() {		public int describeContents() {
	return 0;		return 0;
	@@ -68,13 +56,11 @@ public final class ConnectivityMetricsEvent implements Parcelable {
	@Override		@Override
	public void writeToParcel(Parcel dest, int flags) {		public void writeToParcel(Parcel dest, int flags) {
	dest.writeLong(timestamp);		dest.writeLong(timestamp);
	dest.writeInt(componentTag);
	dest.writeInt(eventTag);
	dest.writeParcelable(data, 0);		dest.writeParcelable(data, 0);
	}		}

			@Override
	public String toString() {		public String toString() {
	return String.format("ConnectivityMetricsEvent(%tT.%tL, %d, %d): %s",		return String.format("ConnectivityMetricsEvent(%tT.%tL): %s", timestamp, timestamp, data);
	timestamp, timestamp, componentTag, eventTag, data);
	}		}
	}		}

core/java/android/net/metrics/IpConnectivityLog.java

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -74,7 +74,10 @@ public class IpConnectivityLog {
	}		}

	try {		try {
	int left = mService.logEvent(new ConnectivityMetricsEvent(timestamp, 0, 0, data));		ConnectivityMetricsEvent ev = new ConnectivityMetricsEvent();
			ev.timestamp = timestamp;
			ev.data = data;
			int left = mService.logEvent(ev);
	return left >= 0;		return left >= 0;
	} catch (RemoteException e) {		} catch (RemoteException e) {
	Log.e(TAG, "Error logging event", e);		Log.e(TAG, "Error logging event", e);

tests/net/java/com/android/server/connectivity/IpConnectivityMetricsTest.java

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -315,14 +315,15 @@ public class IpConnectivityMetricsTest extends TestCase {
	}		}

	static ConnectivityMetricsEvent expectedEvent(int timestamp) {		static ConnectivityMetricsEvent expectedEvent(int timestamp) {
	return new ConnectivityMetricsEvent((long)timestamp, 0, 0, FAKE_EV);		ConnectivityMetricsEvent ev = new ConnectivityMetricsEvent();
			ev.timestamp = timestamp;
			ev.data = FAKE_EV;
			return ev;
	}		}

	/** Outer equality for ConnectivityMetricsEvent to avoid overriding equals() and hashCode(). */		/** Outer equality for ConnectivityMetricsEvent to avoid overriding equals() and hashCode(). */
	static void assertEventsEqual(ConnectivityMetricsEvent expected, ConnectivityMetricsEvent got) {		static void assertEventsEqual(ConnectivityMetricsEvent expected, ConnectivityMetricsEvent got) {
	assertEquals(expected.timestamp, got.timestamp);		assertEquals(expected.timestamp, got.timestamp);
	assertEquals(expected.componentTag, got.componentTag);
	assertEquals(expected.eventTag, got.eventTag);
	assertEquals(expected.data, got.data);		assertEquals(expected.data, got.data);
	}		}

tests/net/java/com/android/server/connectivity/MetricsTestUtil.java

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -28,7 +28,10 @@ abstract public class MetricsTestUtil {
	}		}

	static ConnectivityMetricsEvent ev(Parcelable p) {		static ConnectivityMetricsEvent ev(Parcelable p) {
	return new ConnectivityMetricsEvent(1L, 0, 0, p);		ConnectivityMetricsEvent ev = new ConnectivityMetricsEvent();
			ev.timestamp = 1L;
			ev.data = p;
			return ev;
	}		}

	static ConnectivityMetricsEvent describeIpEvent(Consumer<Parcel>... fs) {		static ConnectivityMetricsEvent describeIpEvent(Consumer<Parcel>... fs) {