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

Merge "Make TYPE_VPN_LEGACY no longer deprecated."

Browse Source
This commit is contained in:
Treehugger Robot
2021-04-15 03:57:20 +00:00
committed by Gerrit Code Review
parent 51e5e80876 fb7f36b3cb
commit 590949fd61
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -98,7 +98,7 @@ package android.net {
} }
public class VpnManager { public class VpnManager {
field @Deprecated public static final int TYPE_VPN_LEGACY = 3; // 0x3 field public static final int TYPE_VPN_LEGACY = 3; // 0x3
field public static final int TYPE_VPN_NONE = -1; // 0xffffffff field public static final int TYPE_VPN_NONE = -1; // 0xffffffff
field public static final int TYPE_VPN_OEM = 4; // 0x4 field public static final int TYPE_VPN_OEM = 4; // 0x4
field public static final int TYPE_VPN_PLATFORM = 2; // 0x2 field public static final int TYPE_VPN_PLATFORM = 2; // 0x2

4
core/java/android/net/VpnManager.java
View File

@@ -78,10 +78,8 @@ public class VpnManager {
/** /**
* An IPsec VPN created by the built-in LegacyVpnRunner. * An IPsec VPN created by the built-in LegacyVpnRunner.
* @deprecated new Android devices should use VPN_TYPE_PLATFORM instead.
* @hide * @hide
*/ */
@Deprecated
@SystemApi(client = MODULE_LIBRARIES) @SystemApi(client = MODULE_LIBRARIES)
public static final int TYPE_VPN_LEGACY = 3; public static final int TYPE_VPN_LEGACY = 3;
@@ -418,4 +416,4 @@ public class VpnManager {
throw e.rethrowFromSystemServer(); throw e.rethrowFromSystemServer();
} }
} }
} }