Merge "Expose getCapabilities" am: ca98471c77 am: f21c73b7ad am: 00a76b180b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1641919 Change-Id: I9a6b6f405ee4b7d5d03173d6c5e22e1018dc3417
2021-03-19 11:32:07 +00:00
parent db597e7819 f21c73b7ad
commit 7ead06e186
2 changed files with 2 additions and 3 deletions
--- a/framework/src/android/net/NetworkCapabilities.java
+++ b/framework/src/android/net/NetworkCapabilities.java
@@ -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);
    }