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

Commit 7c4d9a64 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Automerger Merge Worker
Browse files

Merge "Add VpnManager.TYPE_VPN_OEM_* constants for OEM use." into main am: f5b136e0 

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



Change-Id: Iea9ea64575cbf70ab8d50839973b1e6b6c8cedba
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4bb9796b f5b136e0

core/api/module-lib-current.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -294,6 +294,8 @@ package android.net { 
    field 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 @FlaggedApi("android.net.platform.flags.vpn_type_oem_service_and_legacy") public static final int TYPE_VPN_OEM_LEGACY = 6; // 0x6

    field @FlaggedApi("android.net.platform.flags.vpn_type_oem_service_and_legacy") public static final int TYPE_VPN_OEM_SERVICE = 5; // 0x5

    field public static final int TYPE_VPN_PLATFORM = 2; // 0x2

    field public static final int TYPE_VPN_PLATFORM = 2; // 0x2

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

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

  }

  }

core/java/android/net/VpnManager.java

+24 −2
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ 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.FlaggedApi;

import android.annotation.IntDef;

import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.Nullable;
@@ -32,6 +33,7 @@ import android.content.ComponentName; 
import android.content.Context;

import android.content.Context;

import android.content.Intent;

import android.content.Intent;

import android.content.res.Resources;

import android.content.res.Resources;

import android.net.platform.flags.Flags;

import android.os.RemoteException;

import android.os.RemoteException;





import com.android.internal.net.LegacyVpnInfo;

import com.android.internal.net.LegacyVpnInfo;
@@ -85,12 +87,32 @@ public class VpnManager { 
    public static final int TYPE_VPN_LEGACY = 3;

    public static final int TYPE_VPN_LEGACY = 3;





    /**

    /**

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

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

     * @hide

     * @hide

     */

     */

    @SystemApi(client = MODULE_LIBRARIES)

    @SystemApi(client = MODULE_LIBRARIES)

    public static final int TYPE_VPN_OEM = 4;

    public static final int TYPE_VPN_OEM = 4;





    /**

     * A VPN created by OEM code using {@link VpnService}, and which OEM code desires to

     * differentiate from other VPN types. The core networking stack will treat this VPN type

     * similarly to {@link #TYPE_VPN_SERVICE}.

     * @hide

     */

    @FlaggedApi(Flags.FLAG_VPN_TYPE_OEM_SERVICE_AND_LEGACY)

    @SystemApi(client = MODULE_LIBRARIES)

    public static final int TYPE_VPN_OEM_SERVICE = 5;



    /**

     * A VPN created by OEM code using the legacy VPN mechanisms, and which OEM code desires to

     * differentiate from other VPN types. The core networking stack will treat this VPN type

     * similarly to {@link #TYPE_VPN_LEGACY}.

     * @hide

     */

    @FlaggedApi(Flags.FLAG_VPN_TYPE_OEM_SERVICE_AND_LEGACY)

    @SystemApi(client = MODULE_LIBRARIES)

    public static final int TYPE_VPN_OEM_LEGACY = 6;



    /**

    /**

     * Channel for VPN notifications.

     * Channel for VPN notifications.

     * @hide

     * @hide
@@ -308,7 +330,7 @@ public class VpnManager { 




    /** @hide */

    /** @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})

            TYPE_VPN_OEM, TYPE_VPN_OEM_SERVICE, TYPE_VPN_OEM_LEGACY})

    @Retention(RetentionPolicy.SOURCE)

    @Retention(RetentionPolicy.SOURCE)

    public @interface VpnType {}

    public @interface VpnType {}

core/java/android/net/flags.aconfig

+8 −0
Original line number Original line Diff line number Diff line
@@ -45,3 +45,11 @@ flag { 
  description: "Flag for MDNS quality, reliability and performance improvement in 25Q2"

  description: "Flag for MDNS quality, reliability and performance improvement in 25Q2"

  bug: "373270045"

  bug: "373270045"

}

}



flag {

  name: "vpn_type_oem_service_and_legacy"

  namespace: "android_core_networking"

  is_exported: false

  description: "Flags the TYPE_VPN_OEM_SERVICE and TYPE_VPN_OEM_LEGACY VpnManager API constants"

  bug: "389829981"

}