Merge changes Ieef54d84,Ica3e88c2 am: 491f53523a am: 8e4ce11318 (b809148b) · Commits · e / os / android_frameworks_base

api/system-current.txt

+7 −0

Original line number	Diff line number	Diff line
		@@ -4171,6 +4171,7 @@ package android.net.metrics {
		public class IpConnectivityLog {
		method public boolean log(long, android.net.metrics.IpConnectivityLog.Event);
		method public boolean log(String, android.net.metrics.IpConnectivityLog.Event);
		method public boolean log(android.net.Network, int[], android.net.metrics.IpConnectivityLog.Event);
		method public boolean log(int, int[], android.net.metrics.IpConnectivityLog.Event);
		method public boolean log(android.net.metrics.IpConnectivityLog.Event);
		}
		@@ -5082,6 +5083,12 @@ package android.os {
		method public void onResult(android.os.Bundle);
		}

		public class ServiceSpecificException extends java.lang.RuntimeException {
		ctor public ServiceSpecificException(int, String);
		ctor public ServiceSpecificException(int);
		field public final int errorCode;
		}

		public final class StatsDimensionsValue implements android.os.Parcelable {
		method public int describeContents();
		method public boolean getBooleanValue();

+1 −0

Original line number	Diff line number	Diff line
		@@ -920,6 +920,7 @@ package android.net.metrics {
		public class IpConnectivityLog {
		method public boolean log(long, android.net.metrics.IpConnectivityLog.Event);
		method public boolean log(String, android.net.metrics.IpConnectivityLog.Event);
		method public boolean log(android.net.Network, int[], android.net.metrics.IpConnectivityLog.Event);
		method public boolean log(int, int[], android.net.metrics.IpConnectivityLog.Event);
		method public boolean log(android.net.metrics.IpConnectivityLog.Event);
		}

+0 −2

Original line number	Diff line number	Diff line
		@@ -993,8 +993,6 @@ Landroid/os/ServiceManager;->sServiceManager:Landroid/os/IServiceManager;
		Landroid/os/ServiceManagerNative;->asInterface(Landroid/os/IBinder;)Landroid/os/IServiceManager;
		Landroid/os/ServiceManagerProxy;->getService(Ljava/lang/String;)Landroid/os/IBinder;
		Landroid/os/ServiceManagerProxy;->mRemote:Landroid/os/IBinder;
		Landroid/os/ServiceSpecificException;-><init>(ILjava/lang/String;)V
		Landroid/os/ServiceSpecificException;->errorCode:I
		Landroid/os/SharedMemory;->getFd()I
		Landroid/os/ShellCommand;->peekNextArg()Ljava/lang/String;
		Landroid/os/StatFs;->mStat:Landroid/system/StructStatVfs;

+13 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import android.annotation.TestApi;
		import android.annotation.UnsupportedAppUsage;
		import android.net.ConnectivityMetricsEvent;
		import android.net.IIpConnectivityMetrics;
		import android.net.Network;
		import android.os.Parcelable;
		import android.os.RemoteException;
		import android.os.ServiceManager;
		@@ -126,6 +127,18 @@ public class IpConnectivityLog {
		return log(ev);
		}

		/**
		* Log an IpConnectivity event.
		* @param network the network associated with the event.
		* @param transports the current transports of the network associated with the event, as defined
		* in NetworkCapabilities.
		* @param data is a Parcelable instance representing the event.
		* @return true if the event was successfully logged.
		*/
		public boolean log(Network network, int[] transports, Event data) {
		return log(network.netId, transports, data);
		}

		/**
		* Log an IpConnectivity event.
		* @param netid the id of the network associated with the event.

+3 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,8 @@
		*/
		package android.os;

		import android.annotation.SystemApi;

		/**
		* An exception specific to a service.
		*
		@@ -28,6 +30,7 @@ package android.os;
		*
		* @hide
		*/
		@SystemApi
		public class ServiceSpecificException extends RuntimeException {
		public final int errorCode;