Merge "Move QoS API classes to Connectivity" (32a606fe) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+0 −50

Original line number	Diff line number	Diff line
		@@ -6056,9 +6056,6 @@ package android.net {
		method public abstract void onRequestScores(android.net.NetworkKey[]);
		}

		public class NetworkReleasedException extends java.lang.Exception {
		}

		public class NetworkScoreManager {
		method @RequiresPermission(anyOf={android.Manifest.permission.SCORE_NETWORKS, android.Manifest.permission.REQUEST_NETWORK_SCORES}) public boolean clearScores() throws java.lang.SecurityException;
		method @RequiresPermission(anyOf={android.Manifest.permission.SCORE_NETWORKS, android.Manifest.permission.REQUEST_NETWORK_SCORES}) public void disableScoring() throws java.lang.SecurityException;
		@@ -6142,47 +6139,6 @@ package android.net {
		method @NonNull public android.net.OemNetworkPreferences.Builder clearNetworkPreference(@NonNull String);
		}

		public abstract class QosCallback {
		ctor public QosCallback();
		method public void onError(@NonNull android.net.QosCallbackException);
		method public void onQosSessionAvailable(@NonNull android.net.QosSession, @NonNull android.net.QosSessionAttributes);
		method public void onQosSessionLost(@NonNull android.net.QosSession);
		}

		public static class QosCallback.QosCallbackRegistrationException extends java.lang.RuntimeException {
		}

		public final class QosCallbackException extends java.lang.Exception {
		}

		public abstract class QosFilter {
		method @NonNull public abstract android.net.Network getNetwork();
		method public abstract boolean matchesLocalAddress(@NonNull java.net.InetAddress, int, int);
		}

		public final class QosSession implements android.os.Parcelable {
		ctor public QosSession(int, int);
		method public int describeContents();
		method public int getSessionId();
		method public int getSessionType();
		method public long getUniqueId();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.net.QosSession> CREATOR;
		field public static final int TYPE_EPS_BEARER = 1; // 0x1
		}

		public interface QosSessionAttributes {
		}

		public final class QosSocketInfo implements android.os.Parcelable {
		ctor public QosSocketInfo(@NonNull android.net.Network, @NonNull java.net.Socket) throws java.io.IOException;
		method public int describeContents();
		method @NonNull public java.net.InetSocketAddress getLocalSocketAddress();
		method @NonNull public android.net.Network getNetwork();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.net.QosSocketInfo> CREATOR;
		}

		public class RssiCurve implements android.os.Parcelable {
		ctor public RssiCurve(int, int, byte[]);
		ctor public RssiCurve(int, int, byte[], int);
		@@ -6214,12 +6170,6 @@ package android.net {
		field public final android.net.RssiCurve rssiCurve;
		}

		public class SocketLocalAddressChangedException extends java.lang.Exception {
		}

		public class SocketNotBoundException extends java.lang.Exception {
		}

		public class TrafficStats {
		method public static void setThreadStatsTagApp();
		method public static void setThreadStatsTagBackup();

core/java/android/net/QosFilterParcelable.aidl→packages/Connectivity/framework/aidl-export/android/net/QosFilterParcelable.aidl

+0 −0

File moved.

View file

core/java/android/net/QosSession.aidl→packages/Connectivity/framework/aidl-export/android/net/QosSession.aidl

+0 −0

File moved.

View file

core/java/android/net/QosSocketInfo.aidl→packages/Connectivity/framework/aidl-export/android/net/QosSocketInfo.aidl

+0 −0

File moved.

View file

packages/Connectivity/framework/api/system-current.txt

+50 −0

Original line number	Diff line number	Diff line
		@@ -308,6 +308,9 @@ package android.net {
		field public static final int ID_NONE = -1; // 0xffffffff
		}

		public class NetworkReleasedException extends java.lang.Exception {
		}

		public class NetworkRequest implements android.os.Parcelable {
		method @Nullable public String getRequestorPackageName();
		method public int getRequestorUid();
		@@ -317,6 +320,47 @@ package android.net {
		method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_SIGNAL_STRENGTH_WAKEUP) public android.net.NetworkRequest.Builder setSignalStrength(int);
		}

		public abstract class QosCallback {
		ctor public QosCallback();
		method public void onError(@NonNull android.net.QosCallbackException);
		method public void onQosSessionAvailable(@NonNull android.net.QosSession, @NonNull android.net.QosSessionAttributes);
		method public void onQosSessionLost(@NonNull android.net.QosSession);
		}

		public static class QosCallback.QosCallbackRegistrationException extends java.lang.RuntimeException {
		}

		public final class QosCallbackException extends java.lang.Exception {
		}

		public abstract class QosFilter {
		method @NonNull public abstract android.net.Network getNetwork();
		method public abstract boolean matchesLocalAddress(@NonNull java.net.InetAddress, int, int);
		}

		public final class QosSession implements android.os.Parcelable {
		ctor public QosSession(int, int);
		method public int describeContents();
		method public int getSessionId();
		method public int getSessionType();
		method public long getUniqueId();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.net.QosSession> CREATOR;
		field public static final int TYPE_EPS_BEARER = 1; // 0x1
		}

		public interface QosSessionAttributes {
		}

		public final class QosSocketInfo implements android.os.Parcelable {
		ctor public QosSocketInfo(@NonNull android.net.Network, @NonNull java.net.Socket) throws java.io.IOException;
		method public int describeContents();
		method @NonNull public java.net.InetSocketAddress getLocalSocketAddress();
		method @NonNull public android.net.Network getNetwork();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.net.QosSocketInfo> CREATOR;
		}

		public final class RouteInfo implements android.os.Parcelable {
		ctor public RouteInfo(@Nullable android.net.IpPrefix, @Nullable java.net.InetAddress, @Nullable String, int);
		ctor public RouteInfo(@Nullable android.net.IpPrefix, @Nullable java.net.InetAddress, @Nullable String, int, int);
		@@ -331,6 +375,12 @@ package android.net {
		field public static final int SUCCESS = 0; // 0x0
		}

		public class SocketLocalAddressChangedException extends java.lang.Exception {
		}

		public class SocketNotBoundException extends java.lang.Exception {
		}

		public final class StaticIpConfiguration implements android.os.Parcelable {
		ctor public StaticIpConfiguration();
		ctor public StaticIpConfiguration(@Nullable android.net.StaticIpConfiguration);