diff options
| author | 2021-04-15 05:21:26 +0000 | |
|---|---|---|
| committer | 2021-04-15 05:21:26 +0000 | |
| commit | 0d3acacdd56ce86be58aecd70475c5a0673d3775 (patch) | |
| tree | 5c3d51de0ae4a7578b1efb1f7f1861627e78f6c1 | |
| parent | 7a37d828de31416dd6c663f61883e68b2ca23758 (diff) | |
| parent | 9d5240865f7329fb3819c017ec26ea688e6d1a34 (diff) | |
Merge "Make TYPE_VPN_LEGACY no longer deprecated." am: 590949fd61 am: 9d5240865f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675627
Change-Id: I8d483487a84d11670425326dcf278ae131b553d6
| -rw-r--r-- | core/api/module-lib-current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/net/VpnManager.java | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/core/api/module-lib-current.txt b/core/api/module-lib-current.txt index e7a7fd2ea7a1..b1e3e1464e3b 100644 --- a/core/api/module-lib-current.txt +++ b/core/api/module-lib-current.txt @@ -98,7 +98,7 @@ package android.net { } 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_OEM = 4; // 0x4 field public static final int TYPE_VPN_PLATFORM = 2; // 0x2 diff --git a/core/java/android/net/VpnManager.java b/core/java/android/net/VpnManager.java index 5f65d46f3b1e..662ebb356f4c 100644 --- a/core/java/android/net/VpnManager.java +++ b/core/java/android/net/VpnManager.java @@ -78,10 +78,8 @@ public class VpnManager { /** * An IPsec VPN created by the built-in LegacyVpnRunner. - * @deprecated new Android devices should use VPN_TYPE_PLATFORM instead. * @hide */ - @Deprecated @SystemApi(client = MODULE_LIBRARIES) public static final int TYPE_VPN_LEGACY = 3; @@ -418,4 +416,4 @@ public class VpnManager { throw e.rethrowFromSystemServer(); } } -}
\ No newline at end of file +} |