Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d524086 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Make TYPE_VPN_LEGACY no longer deprecated." am: 590949fd 

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

Change-Id: Ic86602adb7f4eb9726337e8bc5ba8a652566c94d
parents e2919bf0 590949fd

core/api/module-lib-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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

core/java/android/net/VpnManager.java

+1 −3
Original line number Diff line number Diff line
@@ -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;