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

Commit fb7f36b3 authored by Lorenzo Colitti's avatar Lorenzo Colitti
Browse files

Make TYPE_VPN_LEGACY no longer deprecated. 

Addresses API council feedback.

Test: m
Fix: 185311050
Change-Id: I93c8c46ceda7b08f9fc0ab8930f6a3c960f30930
parent bd7e7d72

core/api/module-lib-current.txt

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

core/java/android/net/VpnManager.java

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