LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Expose BIP and VSIM relavent definitions" am: 5e6693605c am: 30129ac6cd

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

Change-Id: Ibab74f3bcf6c804a31be54d4b7183ea75a6e172e
This commit is contained in:
Aaron Huang
2021-04-01 13:04:07 +00:00
committed by Automerger Merge Worker
parent 032eba8da7 30129ac6cd
commit 15d9affab4
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/api/system-current.txt
View File

@@ -277,11 +277,13 @@ package android.net {
method @NonNull public int[] getTransportTypes(); method @NonNull public int[] getTransportTypes();
method public boolean isPrivateDnsBroken(); method public boolean isPrivateDnsBroken();
method public boolean satisfiedByNetworkCapabilities(@Nullable android.net.NetworkCapabilities); method public boolean satisfiedByNetworkCapabilities(@Nullable android.net.NetworkCapabilities);
field public static final int NET_CAPABILITY_BIP = 31; // 0x1f
field public static final int NET_CAPABILITY_NOT_VCN_MANAGED = 28; // 0x1c 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
field public static final int NET_CAPABILITY_VEHICLE_INTERNAL = 27; // 0x1b field public static final int NET_CAPABILITY_VEHICLE_INTERNAL = 27; // 0x1b
field public static final int NET_CAPABILITY_VSIM = 30; // 0x1e
} }
public static final class NetworkCapabilities.Builder { public static final class NetworkCapabilities.Builder {

20
framework/src/android/net/NetworkCapabilities.java
View File

@@ -274,6 +274,8 @@ public final class NetworkCapabilities implements Parcelable {
NET_CAPABILITY_VEHICLE_INTERNAL, NET_CAPABILITY_VEHICLE_INTERNAL,
NET_CAPABILITY_NOT_VCN_MANAGED, NET_CAPABILITY_NOT_VCN_MANAGED,
NET_CAPABILITY_ENTERPRISE, NET_CAPABILITY_ENTERPRISE,
NET_CAPABILITY_VSIM,
NET_CAPABILITY_BIP,
}) })
public @interface NetCapability { } public @interface NetCapability { }
@@ -493,8 +495,22 @@ public final class NetworkCapabilities implements Parcelable {
*/ */
public static final int NET_CAPABILITY_ENTERPRISE = 29; public static final int NET_CAPABILITY_ENTERPRISE = 29;
/**
* Indicates that this network has ability to access the carrier's Virtual Sim service.
* @hide
*/
@SystemApi
public static final int NET_CAPABILITY_VSIM = 30;
/**
* Indicates that this network has ability to support Bearer Independent Protol.
* @hide
*/
@SystemApi
public static final int NET_CAPABILITY_BIP = 31;
private static final int MIN_NET_CAPABILITY = NET_CAPABILITY_MMS; private static final int MIN_NET_CAPABILITY = NET_CAPABILITY_MMS;
private static final int MAX_NET_CAPABILITY = NET_CAPABILITY_ENTERPRISE; private static final int MAX_NET_CAPABILITY = NET_CAPABILITY_BIP;
/** /**
* Network capabilities that are expected to be mutable, i.e., can change while a particular * Network capabilities that are expected to be mutable, i.e., can change while a particular
@@ -2101,6 +2117,8 @@ public final class NetworkCapabilities implements Parcelable {
case NET_CAPABILITY_VEHICLE_INTERNAL: return "VEHICLE_INTERNAL"; case NET_CAPABILITY_VEHICLE_INTERNAL: return "VEHICLE_INTERNAL";
case NET_CAPABILITY_NOT_VCN_MANAGED: return "NOT_VCN_MANAGED"; case NET_CAPABILITY_NOT_VCN_MANAGED: return "NOT_VCN_MANAGED";
case NET_CAPABILITY_ENTERPRISE: return "ENTERPRISE"; case NET_CAPABILITY_ENTERPRISE: return "ENTERPRISE";
case NET_CAPABILITY_VSIM: return "VSIM";
case NET_CAPABILITY_BIP: return "BIP";
default: return Integer.toString(capability); default: return Integer.toString(capability);
} }
} }