Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Expose VpnTransportInfo as module-lib API." am: 4a7e41a6e6

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1585572

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I746f6c33ae1076aa057eca1c731847bf59b7ba66
This commit is contained in:
Treehugger Robot
2021-02-15 05:24:28 +00:00
committed by Automerger Merge Worker
parent 246444fef7 4a7e41a6e6
commit 094211dec4
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/api/module-lib-current.txt
View File

@@ -72,6 +72,14 @@ package android.net {
field @NonNull public final java.util.List<java.lang.String> underlyingIfaces; 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 { package android.os {

14
core/java/android/net/VpnTransportInfo.java → packages/Connectivity/framework/src/android/net/VpnTransportInfo.java
View File

@@ -16,8 +16,10 @@
package android.net; package android.net;
import static android.annotation.SystemApi.Client.MODULE_LIBRARIES;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.SystemApi;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.util.SparseArray; import android.util.SparseArray;
@@ -26,7 +28,15 @@ import com.android.internal.util.MessageUtils;
import java.util.Objects; 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 { public final class VpnTransportInfo implements TransportInfo, Parcelable {
private static final SparseArray<String> sTypeToString = private static final SparseArray<String> sTypeToString =
MessageUtils.findMessageNames(new Class[]{VpnManager.class}, new String[]{"TYPE_VPN_"}); MessageUtils.findMessageNames(new Class[]{VpnManager.class}, new String[]{"TYPE_VPN_"});