Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1142b265 authored Feb 24, 2016 by Lorenzo Colitti

resolve merge conflicts of 51e4acb2 to nyc-dev

Also add the appropriate changes to api/test-current.txt, which
is not present on mm-wireless-dev from which this change came.

Change-Id: Ic4df6d0f89add73b7e5252ef662de07a4e8fce31

parents 6831e8ea 51e4acb2

Android.mk

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -194,6 +194,8 @@ LOCAL_SRC_FILES += \
	core/java/android/hardware/usb/IUsbManager.aidl \		core/java/android/hardware/usb/IUsbManager.aidl \
	core/java/android/net/ICaptivePortal.aidl \		core/java/android/net/ICaptivePortal.aidl \
	core/java/android/net/IConnectivityManager.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/IEthernetManager.aidl \
	core/java/android/net/IEthernetServiceListener.aidl \		core/java/android/net/IEthernetServiceListener.aidl \
	core/java/android/net/INetworkManagementEventObserver.aidl \		core/java/android/net/INetworkManagementEventObserver.aidl \

api/current.txt

+11 −0

Original line number	Original line	Diff line number	Diff line
	@@ -23514,6 +23514,17 @@ package android.net {
	method public abstract void onNetworkActive();		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 {		public class Credentials {
	ctor public Credentials(int, int, int);		ctor public Credentials(int, int, int);
	method public int getGid();		method public int getGid();

api/system-current.txt

+11 −0

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

			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 {		public class Credentials {
	ctor public Credentials(int, int, int);		ctor public Credentials(int, int, int);
	method public int getGid();		method public int getGid();

api/test-current.txt

+11 −0

Original line number	Original line	Diff line number	Diff line
	@@ -23523,6 +23523,17 @@ package android.net {
	method public abstract void onNetworkActive();		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 {		public class Credentials {
	ctor public Credentials(int, int, int);		ctor public Credentials(int, int, int);
	method public int getGid();		method public int getGid();

core/java/android/net/ConnectivityMetricsEvent.aidl

0 → 100644

+19 −0

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