Merge "Fix Lint errors for network logging API" (69beada2) · Commits · e / os / android_frameworks_base

core/java/android/app/admin/ConnectEvent.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -74,6 +74,11 @@ public final class ConnectEvent extends NetworkEvent implements Parcelable {
		}
		};

		@Override
		public int describeContents() {
		return 0;
		}

		@Override
		public void writeToParcel(Parcel out, int flags) {
		// write parcel token first

+5 −0

Original line number	Diff line number	Diff line
		@@ -94,6 +94,11 @@ public final class DnsEvent extends NetworkEvent implements Parcelable {
		}
		};

		@Override
		public int describeContents() {
		return 0;
		}

		@Override
		public void writeToParcel(Parcel out, int flags) {
		// write parcel token first

+7 −4

Original line number	Diff line number	Diff line
		@@ -26,14 +26,14 @@ import android.os.ParcelFormatException;
		*/
		public abstract class NetworkEvent implements Parcelable {

		protected static final int PARCEL_TOKEN_DNS_EVENT = 1;
		protected static final int PARCEL_TOKEN_CONNECT_EVENT = 2;
		static final int PARCEL_TOKEN_DNS_EVENT = 1;
		static final int PARCEL_TOKEN_CONNECT_EVENT = 2;

		/** The package name of the UID that performed the query. */
		protected String packageName;
		String packageName;

		/** The timestamp of the event being reported in milliseconds. */
		protected long timestamp;
		long timestamp;

		protected NetworkEvent() {
		//empty constructor
		@@ -81,5 +81,8 @@ public abstract class NetworkEvent implements Parcelable {
		return new NetworkEvent[size];
		}
		};

		@Override
		public abstract void writeToParcel(Parcel out, int flags);
		}