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

Commit 630a5222 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Automerger Merge Worker
Browse files

Merge "Add a VpnManager.TYPE_VPN_OEM." am: 9794a944 

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

Change-Id: Ie010e23484d9ec7ad31631d72292cc52c96f2c10
parents 5cb76b50 9794a944

core/api/module-lib-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -85,6 +85,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_NONE = -1; // 0xffffffff

    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_SERVICE = 1; // 0x1

  }

core/java/android/net/VpnManager.java

+9 −1
Original line number Diff line number Diff line
@@ -85,6 +85,13 @@ public class VpnManager { 
    @SystemApi(client = MODULE_LIBRARIES)

    public static final int TYPE_VPN_LEGACY = 3;



    /**

     * An VPN created by OEM code through other means than {@link VpnService} or {@link VpnManager}.

     * @hide

     */

    @SystemApi(client = MODULE_LIBRARIES)

    public static final int TYPE_VPN_OEM = 4;



    /**

     * Channel for VPN notifications.

     * @hide
@@ -92,7 +99,8 @@ public class VpnManager { 
    public static final String NOTIFICATION_CHANNEL_VPN = "VPN";



    /** @hide */

    @IntDef(value = {TYPE_VPN_NONE, TYPE_VPN_SERVICE, TYPE_VPN_PLATFORM, TYPE_VPN_LEGACY})

    @IntDef(value = {TYPE_VPN_NONE, TYPE_VPN_SERVICE, TYPE_VPN_PLATFORM, TYPE_VPN_LEGACY,

            TYPE_VPN_OEM})

    @Retention(RetentionPolicy.SOURCE)

    public @interface VpnType {}

tests/net/java/android/net/VpnTransportInfoTest.java

+6 −0
Original line number Diff line number Diff line
@@ -42,7 +42,13 @@ public class VpnTransportInfoTest { 
        VpnTransportInfo v1 = new VpnTransportInfo(VpnManager.TYPE_VPN_PLATFORM);

        VpnTransportInfo v2 = new VpnTransportInfo(VpnManager.TYPE_VPN_SERVICE);

        VpnTransportInfo v3 = new VpnTransportInfo(VpnManager.TYPE_VPN_PLATFORM);

        VpnTransportInfo v4 = new VpnTransportInfo(VpnManager.TYPE_VPN_LEGACY);

        VpnTransportInfo v5 = new VpnTransportInfo(VpnManager.TYPE_VPN_OEM);



        assertNotEquals(v1, v2);

        assertNotEquals(v3, v4);

        assertNotEquals(v4, v5);



        assertEquals(v1, v3);

        assertEquals(v1.hashCode(), v3.hashCode());

    }