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

Commit 334952fc authored by Sarah Chin's avatar Sarah Chin
Browse files

API to get network visible network capability name 

Test: atest DataConnectionTest, DcTrackerTest
Bug: 181916712
CTS-Coverage-Bug: 183553812
Change-Id: Iae63ac4d62641cee2bd0f0c5f50dd729750d514c
parent 720ebdc4

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -270,6 +270,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
@@ -711,6 +711,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 =