diff options
| -rw-r--r-- | core/api/module-lib-current.txt | 8 | ||||
| -rw-r--r-- | packages/Connectivity/framework/src/android/net/VpnTransportInfo.java (renamed from core/java/android/net/VpnTransportInfo.java) | 14 |
2 files changed, 20 insertions, 2 deletions
diff --git a/core/api/module-lib-current.txt b/core/api/module-lib-current.txt index c7d96effba11..1fb5de3170db 100644 --- a/core/api/module-lib-current.txt +++ b/core/api/module-lib-current.txt @@ -72,6 +72,14 @@ package android.net { field @NonNull public final java.util.List<java.lang.String> underlyingIfaces; } + public final class VpnTransportInfo implements android.os.Parcelable android.net.TransportInfo { + ctor public VpnTransportInfo(int); + method public int describeContents(); + method public void writeToParcel(@NonNull android.os.Parcel, int); + field @NonNull public static final android.os.Parcelable.Creator<android.net.VpnTransportInfo> CREATOR; + field public final int type; + } + } package android.os { diff --git a/core/java/android/net/VpnTransportInfo.java b/packages/Connectivity/framework/src/android/net/VpnTransportInfo.java index 082fa58f8ac2..0242ba08742c 100644 --- a/core/java/android/net/VpnTransportInfo.java +++ b/packages/Connectivity/framework/src/android/net/VpnTransportInfo.java @@ -16,8 +16,10 @@ package android.net; +import static android.annotation.SystemApi.Client.MODULE_LIBRARIES; + import android.annotation.NonNull; -import android.annotation.Nullable; +import android.annotation.SystemApi; import android.os.Parcel; import android.os.Parcelable; import android.util.SparseArray; @@ -26,7 +28,15 @@ import com.android.internal.util.MessageUtils; import java.util.Objects; -/** @hide */ +/** + * Container for VPN-specific transport information. + * + * @see android.net.TransportInfo + * @see NetworkCapabilities#getTransportInfo() + * + * @hide + */ +@SystemApi(client = MODULE_LIBRARIES) public final class VpnTransportInfo implements TransportInfo, Parcelable { private static final SparseArray<String> sTypeToString = MessageUtils.findMessageNames(new Class[]{VpnManager.class}, new String[]{"TYPE_VPN_"}); |