summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorlucaslin <lucaslin@google.com>2021-03-10 16:57:57 +0800
committerlucaslin <lucaslin@google.com>2021-03-10 16:57:57 +0800
commit62b2252831aa1f02fe0af829342e854b5054074e (patch)
tree91c04b0f2dfc751434d7855fa7a8f077b89a97b3 /core/java
parent54a3e529986904e77314cf8b729e7acccbfb629b (diff)
Expose TYPE_VPN_* constants
Expose TYPE_VPN_* constants so that connectivity mainline module can access them. Bug: 172183305 Test: atest FrameworksNetTests Change-Id: Ic8d46a392f3deda5983c52b43585707fa2c98f57
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/net/VpnManager.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/core/java/android/net/VpnManager.java b/core/java/android/net/VpnManager.java
index f472ed4381d1..77754d1256a7 100644
--- a/core/java/android/net/VpnManager.java
+++ b/core/java/android/net/VpnManager.java
@@ -16,12 +16,15 @@
package android.net;
+import static android.annotation.SystemApi.Client.MODULE_LIBRARIES;
+
import static com.android.internal.util.Preconditions.checkNotNull;
import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.RequiresPermission;
+import android.annotation.SystemApi;
import android.annotation.UserIdInt;
import android.app.Activity;
import android.content.ComponentName;
@@ -56,18 +59,21 @@ import java.util.List;
*/
public class VpnManager {
/** Type representing a lack of VPN @hide */
+ @SystemApi(client = MODULE_LIBRARIES)
public static final int TYPE_VPN_NONE = -1;
/**
* A VPN created by an app using the {@link VpnService} API.
* @hide
*/
+ @SystemApi(client = MODULE_LIBRARIES)
public static final int TYPE_VPN_SERVICE = 1;
/**
* A VPN created using a {@link VpnManager} API such as {@link #startProvisionedVpnProfile}.
* @hide
*/
+ @SystemApi(client = MODULE_LIBRARIES)
public static final int TYPE_VPN_PLATFORM = 2;
/**
@@ -76,6 +82,7 @@ public class VpnManager {
* @hide
*/
@Deprecated
+ @SystemApi(client = MODULE_LIBRARIES)
public static final int TYPE_VPN_LEGACY = 3;
/**