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

Merge "API to get network visible network capability name"

Browse Source
This commit is contained in:
Sarah Chin
2021-04-02 16:50:10 +00:00
committed by Gerrit Code Review
parent 5e6693605c 8fc279e0cc
commit aac4d3242a
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -273,6 +273,7 @@ package android.net {
public final class NetworkCapabilities implements android.os.Parcelable { public final class NetworkCapabilities implements android.os.Parcelable {
method @NonNull public int[] getAdministratorUids(); method @NonNull public int[] getAdministratorUids();
method @Nullable public static String getCapabilityCarrierName(int);
method @Nullable public String getSsid(); method @Nullable public String getSsid();
method @NonNull public int[] getTransportTypes(); method @NonNull public int[] getTransportTypes();
method public boolean isPrivateDnsBroken(); method public boolean isPrivateDnsBroken();

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

@@ -728,6 +728,23 @@ public final class NetworkCapabilities implements Parcelable {
return ((mNetworkCapabilities & CONNECTIVITY_MANAGED_CAPABILITIES) != 0); return ((mNetworkCapabilities & CONNECTIVITY_MANAGED_CAPABILITIES) != 0);
} }
/**
* Get the name of the given capability that carriers use.
* If the capability does not have a carrier-name, returns null.
*
* @param capability The capability to get the carrier-name of.
* @return The carrier-name of the capability, or null if it doesn't exist.
* @hide
*/
@SystemApi
public static @Nullable String getCapabilityCarrierName(@NetCapability int capability) {
if (capability == NET_CAPABILITY_ENTERPRISE) {
return capabilityNameOf(capability);
} else {
return null;
}
}
private void combineNetCapabilities(@NonNull NetworkCapabilities nc) { private void combineNetCapabilities(@NonNull NetworkCapabilities nc) {
final long wantedCaps = this.mNetworkCapabilities | nc.mNetworkCapabilities; final long wantedCaps = this.mNetworkCapabilities | nc.mNetworkCapabilities;
final long unwantedCaps = final long unwantedCaps =