diff options
| author | lucaslin <lucaslin@google.com> | 2021-03-18 20:30:22 +0800 |
|---|---|---|
| committer | lucaslin <lucaslin@google.com> | 2021-03-18 20:30:22 +0800 |
| commit | 20ed872a1765ff9fac7be67ed5fbf30868cebd21 (patch) | |
| tree | e4084fc9656a861e41560e675aba67d2475b6156 | |
| parent | dd68ace7e0f082394e10997cfb2e42fb0361e1f1 (diff) | |
Expose getCapabilities
Expose getCapabilities() for EthernetNetworkFactory.
Bug: 182963415
Test: m ethernet-service
Change-Id: I430416af8fae3d4ee99f2f2abe529e3051e9e5cb
| -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); } |