| commit | f21c73b7ad96b22cbbd7c946f962b8d96cc34cc6 | [log] [tgz] |
|---|---|---|
| author | Lucas Lin <lucaslin@google.com> | Fri Mar 19 10:49:12 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 19 10:49:12 2021 +0000 |
| tree | 712a22abe1214cd1313176842f6e7d49fc9fee27 | |
| parent | f6ad9e71b2e606d53143bfb2f706c20df47f1836 [diff] | |
| parent | ca98471c773871dc15c6d68b7fd0661d75457406 [diff] |
Merge "Expose getCapabilities" am: ca98471c77 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1641919 Change-Id: Ie524f7538aa7a7048c55097c0995d8c6194dc682
diff --git a/framework/api/current.txt b/framework/api/current.txt index f22d4b7..e415e01 100644 --- a/framework/api/current.txt +++ b/framework/api/current.txt
@@ -291,6 +291,7 @@ 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/framework/src/android/net/NetworkCapabilities.java b/framework/src/android/net/NetworkCapabilities.java index 058f3c9..5ec7aa1 100644 --- a/framework/src/android/net/NetworkCapabilities.java +++ b/framework/src/android/net/NetworkCapabilities.java
@@ -609,10 +609,8 @@ * 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); }