Merge "Add Connectivity Metrics Logger service" into mm-wireless-dev (51e4acb2) · Commits · e / os / android_frameworks_base

Android.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -189,6 +189,8 @@ LOCAL_SRC_FILES += \
		core/java/android/hardware/usb/IUsbManager.aidl \
		core/java/android/net/ICaptivePortal.aidl \
		core/java/android/net/IConnectivityManager.aidl \
		core/java/android/net/IConnectivityMetricsLogger.aidl \
		core/java/android/net/IConnectivityMetricsLoggerSubscriber.aidl \
		core/java/android/net/IEthernetManager.aidl \
		core/java/android/net/IEthernetServiceListener.aidl \
		core/java/android/net/INetworkManagementEventObserver.aidl \

api/current.txt

+11 −0

Original line number	Diff line number	Diff line
		@@ -18207,6 +18207,17 @@ package android.net {
		method public abstract void onNetworkActive();
		}

		public class ConnectivityMetricsEvent implements android.os.Parcelable {
		ctor public ConnectivityMetricsEvent(long, int, int, android.os.Parcelable);
		method public int describeContents();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.net.ConnectivityMetricsEvent> CREATOR;
		field public final int componentTag;
		field public final android.os.Parcelable data;
		field public final int eventTag;
		field public final long timestamp;
		}

		public class Credentials {
		ctor public Credentials(int, int, int);
		method public int getGid();

api/system-current.txt

+11 −0

Original line number	Diff line number	Diff line
		@@ -19720,6 +19720,17 @@ package android.net {
		method public abstract void onNetworkActive();
		}

		public class ConnectivityMetricsEvent implements android.os.Parcelable {
		ctor public ConnectivityMetricsEvent(long, int, int, android.os.Parcelable);
		method public int describeContents();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.net.ConnectivityMetricsEvent> CREATOR;
		field public final int componentTag;
		field public final android.os.Parcelable data;
		field public final int eventTag;
		field public final long timestamp;
		}

		public class Credentials {
		ctor public Credentials(int, int, int);
		method public int getGid();

core/java/android/net/ConnectivityMetricsEvent.aidl

0 → 100644

+19 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2016 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.net;

		parcelable ConnectivityMetricsEvent;

core/java/android/net/ConnectivityMetricsEvent.java

0 → 100644

+82 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2016 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.net;

		import android.annotation.SystemApi;
		import android.os.Parcel;
		import android.os.Parcelable;

		@SystemApi
		public class ConnectivityMetricsEvent implements Parcelable {

		/** The time when this event was collected, as returned by System.currentTimeMillis(). */
		final 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. */
		final public Parcelable data;

		public ConnectivityMetricsEvent(long timestamp, int componentTag,
		int eventTag, Parcelable data) {
		this.timestamp = timestamp;
		this.componentTag = componentTag;
		this.eventTag = eventTag;
		this.data = data;
		}

		/** Implement the Parcelable interface */
		public static final Parcelable.Creator<ConnectivityMetricsEvent> CREATOR
		= new Parcelable.Creator<ConnectivityMetricsEvent> (){
		public ConnectivityMetricsEvent createFromParcel(Parcel source) {
		final long timestamp = source.readLong();
		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) {
		return new ConnectivityMetricsEvent[size];
		}
		};

		/** Implement the Parcelable interface */
		@Override
		public int describeContents() {
		return 0;
		}

		/** Implement the Parcelable interface */
		@Override
		public void writeToParcel(Parcel dest, int flags) {
		dest.writeLong(timestamp);
		dest.writeInt(componentTag);
		dest.writeInt(eventTag);
		dest.writeParcelable(data, 0);
		}

		public String toString() {
		return String.format("ConnectivityMetricsEvent(%d, %d, %d)", timestamp,
		componentTag, eventTag);
		}
		}