From fb7f36b3cb10abc9c334c3bf959631437c67ac51 Mon Sep 17 00:00:00 2001
From: Lorenzo Colitti <lorenzo@google.com>
Date: Wed, 14 Apr 2021 22:43:34 +0900
Subject: [PATCH] Make TYPE_VPN_LEGACY no longer deprecated.

Addresses API council feedback.

Test: m
Fix: 185311050
Change-Id: I93c8c46ceda7b08f9fc0ab8930f6a3c960f30930
---
 core/api/module-lib-current.txt       | 2 +-
 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 e7a7fd2ea7a1f..b1e3e1464e3be 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 5f65d46f3b1ed..662ebb356f4c4 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
+}