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

Commit 46f43768 authored by Lucas Lin's avatar Lucas Lin Committed by Automerger Merge Worker
Browse files

Merge "Expose getCapabilities" am: 46e3f182 am: beea63a6 am: 00a76b18 

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

Change-Id: I9a6b6f405ee4b7d5d03173d6c5e22e1018dc3417
parents 0343bbff 00a76b18

packages/Connectivity/framework/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -291,6 +291,7 @@ package android.net { 
    ctor public NetworkCapabilities();

    ctor public NetworkCapabilities(android.net.NetworkCapabilities);

    method public int describeContents();

    method @NonNull public int[] getCapabilities();

    method public int getLinkDownstreamBandwidthKbps();

    method public int getLinkUpstreamBandwidthKbps();

    method @Nullable public android.net.NetworkSpecifier getNetworkSpecifier();

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

+1 −3
Original line number Diff line number Diff line
@@ -610,10 +610,8 @@ public final class NetworkCapabilities implements Parcelable { 
     * Gets all the capabilities set on this {@code NetworkCapability} instance.

     *

     * @return an array of capability values for this instance.

     * @hide

     */

    @UnsupportedAppUsage

    public @NetCapability int[] getCapabilities() {

    public @NonNull @NetCapability int[] getCapabilities() {

        return NetworkCapabilitiesUtils.unpackBits(mNetworkCapabilities);

    }