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

Commit 1fd78110 authored by Lucas Lin's avatar Lucas Lin Committed by Automerger Merge Worker
Browse files

Merge "Expose TYPE_VPN_* constants" am: d2b8d781 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I02bdba628c0d1ef2dbf82dcc5b4f7f09a2ea7eb7
parents b59b8b00 d2b8d781

core/api/module-lib-current.txt

+7 −0
Original line number Diff line number Diff line
@@ -56,6 +56,13 @@ package android.net { 
    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 {

core/java/android/net/VpnManager.java

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


package android.net;



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



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



import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.RequiresPermission;

import android.annotation.SystemApi;

import android.annotation.UserIdInt;

import android.app.Activity;

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

public class VpnManager {

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

    @SystemApi(client = MODULE_LIBRARIES)

    public static final int TYPE_VPN_NONE = -1;



    /**

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

     * @hide

     */

    @SystemApi(client = MODULE_LIBRARIES)

    public static final int TYPE_VPN_SERVICE = 1;



    /**

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

     * @hide

     */

    @SystemApi(client = MODULE_LIBRARIES)

    public static final int TYPE_VPN_PLATFORM = 2;



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

     */

    @Deprecated

    @SystemApi(client = MODULE_LIBRARIES)

    public static final int TYPE_VPN_LEGACY = 3;



    /**