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

Commit b57e9b2d authored by Junyu Lai's avatar Junyu Lai Committed by Automerger Merge Worker
Browse files

Merge "[VCN08] Expose NOT_VCN_MANAGED capability as system API" am: 4a76351c am: 2562ab48 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib2b868b8e3be84e3e16fdf9a5c216b270e76e32e
parents c0939803 2562ab48

core/api/system-current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -6286,6 +6286,7 @@ package android.net { 
    method @Nullable public String getSsid();

    method @Nullable public String getSsid();

    method @NonNull public int[] getTransportTypes();

    method @NonNull public int[] getTransportTypes();

    method public boolean satisfiedByNetworkCapabilities(@Nullable android.net.NetworkCapabilities);

    method public boolean satisfiedByNetworkCapabilities(@Nullable android.net.NetworkCapabilities);

    field public static final int NET_CAPABILITY_NOT_VCN_MANAGED = 28; // 0x1c

    field public static final int NET_CAPABILITY_OEM_PAID = 22; // 0x16

    field public static final int NET_CAPABILITY_OEM_PAID = 22; // 0x16

    field public static final int NET_CAPABILITY_OEM_PRIVATE = 26; // 0x1a

    field public static final int NET_CAPABILITY_OEM_PRIVATE = 26; // 0x1a

    field public static final int NET_CAPABILITY_PARTIAL_CONNECTIVITY = 24; // 0x18

    field public static final int NET_CAPABILITY_PARTIAL_CONNECTIVITY = 24; // 0x18

packages/Connectivity/framework/src/android/net/NetworkCapabilities.java

+10 −3
Original line number Original line Diff line number Diff line
@@ -401,11 +401,18 @@ public final class NetworkCapabilities implements Parcelable { 
    public static final int NET_CAPABILITY_VEHICLE_INTERNAL = 27;

    public static final int NET_CAPABILITY_VEHICLE_INTERNAL = 27;





    /**

    /**

     * Indicates that this network is not managed by a Virtual Carrier Network (VCN).

     * Indicates that this network is not subsumed by a Virtual Carrier Network (VCN).

     *

     * <p>

     * TODO(b/177299683): Add additional clarifying javadoc.

     * To provide an experience on a VCN similar to a single traditional carrier network, in

     * some cases the system sets this bit is set by default in application's network requests,

     * and may choose to remove it at its own discretion when matching the request to a network.

     * <p>

     * Applications that want to know about a Virtual Carrier Network's underlying networks,

     * for example to use them for multipath purposes, should remove this bit from their network

     * requests ; the system will not add it back once removed.

     * @hide

     * @hide

     */

     */

    @SystemApi

    public static final int NET_CAPABILITY_NOT_VCN_MANAGED = 28;

    public static final int NET_CAPABILITY_NOT_VCN_MANAGED = 28;





    private static final int MIN_NET_CAPABILITY = NET_CAPABILITY_MMS;

    private static final int MIN_NET_CAPABILITY = NET_CAPABILITY_MMS;