diff options
| author | 2021-03-19 11:07:40 +0000 | |
|---|---|---|
| committer | 2021-03-19 11:07:40 +0000 | |
| commit | 00a76b180b60dcffef2dd530ce2fb5675785bbd1 (patch) | |
| tree | 51e89f491bbb3a8be1d7a0b5c3c2b28dd269dd4e | |
| parent | f04d15c33d611a3f567be2a0a76ffebcf9c3c6b5 (diff) | |
| parent | beea63a64f90cf4763c3a6d3dd16ba745ddcb59f (diff) | |
Merge "Expose getCapabilities" am: 46e3f1822d am: beea63a64f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1641919
Change-Id: I5a7df27d7b6f7eca0364c3d88d4ad8663063cb3e
| -rw-r--r-- | packages/Connectivity/framework/api/current.txt | 1 | ||||
| -rw-r--r-- | packages/Connectivity/framework/src/android/net/NetworkCapabilities.java | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/packages/Connectivity/framework/api/current.txt b/packages/Connectivity/framework/api/current.txt index f22d4b7b779a..e415e01fea3a 100644 --- a/packages/Connectivity/framework/api/current.txt +++ b/packages/Connectivity/framework/api/current.txt @@ -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(); diff --git a/packages/Connectivity/framework/src/android/net/NetworkCapabilities.java b/packages/Connectivity/framework/src/android/net/NetworkCapabilities.java index 058f3c999dd7..5ec7aa1b23ac 100644 --- a/packages/Connectivity/framework/src/android/net/NetworkCapabilities.java +++ b/packages/Connectivity/framework/src/android/net/NetworkCapabilities.java @@ -609,10 +609,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); } |