From 3550d4bab5549acf8f3f595e372da912ef782058 Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Mon, 1 Mar 2021 17:53:45 +0900 Subject: [PATCH] Move QoS API classes to Connectivity The classes were added in S and are used to back ConnectivityManager APIs. Add them to the connectivity boundary as they belong together with ConnectivityManager. Bug: 181512874 Test: m Change-Id: I03b5978949b200a72813d1ebc4812d851fe3df37 --- core/api/system-current.txt | 50 ------------------- .../android/net/QosFilterParcelable.aidl | 0 .../aidl-export}/android/net/QosSession.aidl | 0 .../android/net/QosSocketInfo.aidl | 0 .../framework/api/system-current.txt | 50 +++++++++++++++++++ .../src}/android/net/IQosCallback.aidl | 0 .../android/net/NetworkReleasedException.java | 0 .../src}/android/net/QosCallback.java | 0 .../android/net/QosCallbackConnection.java | 0 .../android/net/QosCallbackException.java | 0 .../framework/src}/android/net/QosFilter.java | 0 .../src}/android/net/QosFilterParcelable.java | 0 .../src}/android/net/QosSession.java | 0 .../android/net/QosSessionAttributes.java | 0 .../src}/android/net/QosSocketFilter.java | 0 .../src}/android/net/QosSocketInfo.java | 0 .../SocketLocalAddressChangedException.java | 0 .../android/net/SocketNotBoundException.java | 0 18 files changed, 50 insertions(+), 50 deletions(-) rename {core/java => packages/Connectivity/framework/aidl-export}/android/net/QosFilterParcelable.aidl (100%) rename {core/java => packages/Connectivity/framework/aidl-export}/android/net/QosSession.aidl (100%) rename {core/java => packages/Connectivity/framework/aidl-export}/android/net/QosSocketInfo.aidl (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/IQosCallback.aidl (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/NetworkReleasedException.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/QosCallback.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/QosCallbackConnection.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/QosCallbackException.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/QosFilter.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/QosFilterParcelable.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/QosSession.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/QosSessionAttributes.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/QosSocketFilter.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/QosSocketInfo.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/SocketLocalAddressChangedException.java (100%) rename {core/java => packages/Connectivity/framework/src}/android/net/SocketNotBoundException.java (100%) diff --git a/core/api/system-current.txt b/core/api/system-current.txt index afdf3356201de..f24aedbd7377d 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -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 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 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(); diff --git a/core/java/android/net/QosFilterParcelable.aidl b/packages/Connectivity/framework/aidl-export/android/net/QosFilterParcelable.aidl similarity index 100% rename from core/java/android/net/QosFilterParcelable.aidl rename to packages/Connectivity/framework/aidl-export/android/net/QosFilterParcelable.aidl diff --git a/core/java/android/net/QosSession.aidl b/packages/Connectivity/framework/aidl-export/android/net/QosSession.aidl similarity index 100% rename from core/java/android/net/QosSession.aidl rename to packages/Connectivity/framework/aidl-export/android/net/QosSession.aidl diff --git a/core/java/android/net/QosSocketInfo.aidl b/packages/Connectivity/framework/aidl-export/android/net/QosSocketInfo.aidl similarity index 100% rename from core/java/android/net/QosSocketInfo.aidl rename to packages/Connectivity/framework/aidl-export/android/net/QosSocketInfo.aidl diff --git a/packages/Connectivity/framework/api/system-current.txt b/packages/Connectivity/framework/api/system-current.txt index 41ebc5774f3d4..40c2cd10ba565 100644 --- a/packages/Connectivity/framework/api/system-current.txt +++ b/packages/Connectivity/framework/api/system-current.txt @@ -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 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 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); diff --git a/core/java/android/net/IQosCallback.aidl b/packages/Connectivity/framework/src/android/net/IQosCallback.aidl similarity index 100% rename from core/java/android/net/IQosCallback.aidl rename to packages/Connectivity/framework/src/android/net/IQosCallback.aidl diff --git a/core/java/android/net/NetworkReleasedException.java b/packages/Connectivity/framework/src/android/net/NetworkReleasedException.java similarity index 100% rename from core/java/android/net/NetworkReleasedException.java rename to packages/Connectivity/framework/src/android/net/NetworkReleasedException.java diff --git a/core/java/android/net/QosCallback.java b/packages/Connectivity/framework/src/android/net/QosCallback.java similarity index 100% rename from core/java/android/net/QosCallback.java rename to packages/Connectivity/framework/src/android/net/QosCallback.java diff --git a/core/java/android/net/QosCallbackConnection.java b/packages/Connectivity/framework/src/android/net/QosCallbackConnection.java similarity index 100% rename from core/java/android/net/QosCallbackConnection.java rename to packages/Connectivity/framework/src/android/net/QosCallbackConnection.java diff --git a/core/java/android/net/QosCallbackException.java b/packages/Connectivity/framework/src/android/net/QosCallbackException.java similarity index 100% rename from core/java/android/net/QosCallbackException.java rename to packages/Connectivity/framework/src/android/net/QosCallbackException.java diff --git a/core/java/android/net/QosFilter.java b/packages/Connectivity/framework/src/android/net/QosFilter.java similarity index 100% rename from core/java/android/net/QosFilter.java rename to packages/Connectivity/framework/src/android/net/QosFilter.java diff --git a/core/java/android/net/QosFilterParcelable.java b/packages/Connectivity/framework/src/android/net/QosFilterParcelable.java similarity index 100% rename from core/java/android/net/QosFilterParcelable.java rename to packages/Connectivity/framework/src/android/net/QosFilterParcelable.java diff --git a/core/java/android/net/QosSession.java b/packages/Connectivity/framework/src/android/net/QosSession.java similarity index 100% rename from core/java/android/net/QosSession.java rename to packages/Connectivity/framework/src/android/net/QosSession.java diff --git a/core/java/android/net/QosSessionAttributes.java b/packages/Connectivity/framework/src/android/net/QosSessionAttributes.java similarity index 100% rename from core/java/android/net/QosSessionAttributes.java rename to packages/Connectivity/framework/src/android/net/QosSessionAttributes.java diff --git a/core/java/android/net/QosSocketFilter.java b/packages/Connectivity/framework/src/android/net/QosSocketFilter.java similarity index 100% rename from core/java/android/net/QosSocketFilter.java rename to packages/Connectivity/framework/src/android/net/QosSocketFilter.java diff --git a/core/java/android/net/QosSocketInfo.java b/packages/Connectivity/framework/src/android/net/QosSocketInfo.java similarity index 100% rename from core/java/android/net/QosSocketInfo.java rename to packages/Connectivity/framework/src/android/net/QosSocketInfo.java diff --git a/core/java/android/net/SocketLocalAddressChangedException.java b/packages/Connectivity/framework/src/android/net/SocketLocalAddressChangedException.java similarity index 100% rename from core/java/android/net/SocketLocalAddressChangedException.java rename to packages/Connectivity/framework/src/android/net/SocketLocalAddressChangedException.java diff --git a/core/java/android/net/SocketNotBoundException.java b/packages/Connectivity/framework/src/android/net/SocketNotBoundException.java similarity index 100% rename from core/java/android/net/SocketNotBoundException.java rename to packages/Connectivity/framework/src/android/net/SocketNotBoundException.java