commit bf42eae1626dfb109475670d3e24e015c2c16545
author Lucas Lin <lucaslin@google.com> Fri Mar 19 11:07:40 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Mar 19 11:07:40 2021 +0000
tree dc657fab74054ada36a43f5d4c8340abd36a7d4c
parent 363f1b34c4fcf6372ce7e2b58c26d6158ed489e8
parent e988cf4321faf1855807f1cd03a87685e7387042

Merge "Expose getCapabilities" am: 0f441f7bdd am: e988cf4321

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

Change-Id: I5a7df27d7b6f7eca0364c3d88d4ad8663063cb3e

framework/api/current.txt

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();

framework/src/android/net/NetworkCapabilities.java

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);
     }