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

Commit d2b8d781 authored by Lucas Lin's avatar Lucas Lin Committed by Gerrit Code Review
Browse files

Merge "Expose TYPE_VPN_* constants"

parents 958a1ab3 62b22528

core/api/module-lib-current.txt

+7 −0
Original line number Original line Diff line number Diff line
@@ -56,6 +56,13 @@ package android.net { 
    field @NonNull public final java.util.List<java.lang.String> underlyingIfaces;

    field @NonNull public final java.util.List<java.lang.String> underlyingIfaces;

  }

  }





  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_PLATFORM = 2; // 0x2

    field public static final int TYPE_VPN_SERVICE = 1; // 0x1

  }



}

}





package android.os {

package android.os {

core/java/android/net/VpnManager.java

+7 −0
Original line number Original line Diff line number Diff line
@@ -16,12 +16,15 @@ 




package android.net;

package android.net;





import static android.annotation.SystemApi.Client.MODULE_LIBRARIES;



import static com.android.internal.util.Preconditions.checkNotNull;

import static com.android.internal.util.Preconditions.checkNotNull;





import android.annotation.IntDef;

import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.Nullable;

import android.annotation.RequiresPermission;

import android.annotation.RequiresPermission;

import android.annotation.SystemApi;

import android.annotation.UserIdInt;

import android.annotation.UserIdInt;

import android.app.Activity;

import android.app.Activity;

import android.content.ComponentName;

import android.content.ComponentName;
@@ -56,18 +59,21 @@ import java.util.List; 
 */

 */

public class VpnManager {

public class VpnManager {

    /** Type representing a lack of VPN @hide */

    /** Type representing a lack of VPN @hide */

    @SystemApi(client = MODULE_LIBRARIES)

    public static final int TYPE_VPN_NONE = -1;

    public static final int TYPE_VPN_NONE = -1;





    /**

    /**

     * A VPN created by an app using the {@link VpnService} API.

     * A VPN created by an app using the {@link VpnService} API.

     * @hide

     * @hide

     */

     */

    @SystemApi(client = MODULE_LIBRARIES)

    public static final int TYPE_VPN_SERVICE = 1;

    public static final int TYPE_VPN_SERVICE = 1;





    /**

    /**

     * A VPN created using a {@link VpnManager} API such as {@link #startProvisionedVpnProfile}.

     * A VPN created using a {@link VpnManager} API such as {@link #startProvisionedVpnProfile}.

     * @hide

     * @hide

     */

     */

    @SystemApi(client = MODULE_LIBRARIES)

    public static final int TYPE_VPN_PLATFORM = 2;

    public static final int TYPE_VPN_PLATFORM = 2;





    /**

    /**
@@ -76,6 +82,7 @@ public class VpnManager { 
     * @hide

     * @hide

     */

     */

    @Deprecated

    @Deprecated

    @SystemApi(client = MODULE_LIBRARIES)

    public static final int TYPE_VPN_LEGACY = 3;

    public static final int TYPE_VPN_LEGACY = 3;





    /**

    /**