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

Commit b81fedf5 authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge "API to get network visible network capability name" am: 2229a10c 

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

Change-Id: I7f8b909ec061d8bb875ff2688e2fb9a4cea54318
parents b4401198 2229a10c

packages/Connectivity/framework/api/system-current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -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();

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

+17 −0
Original line number Original line Diff line number Diff line
@@ -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 =