commit 121364aa82b16a7fb67551df37191b8486c1c4a6
author android-build-team Robot <android-build-team-robot@google.com> Wed May 16 07:24:30 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed May 16 07:24:30 2018 +0000
tree 096a33bb1a5cf9f30029b33cc9c7df11fa6b1520
parent d04b401d1f50f484bba64519d07e34925fca5fcf
parent 7b6ed2250708f9be0e2fad87392fed579c2f2954

Snap for 4784261 from 037834d55772403be181cac74e8d806aa3385ddc to pi-release

Change-Id: If699bf35aa77c7c0aeca814b9c02cf155159fa69

core/java/android/net/NetworkCapabilities.java

diff --git a/core/java/android/net/NetworkCapabilities.java b/core/java/android/net/NetworkCapabilities.java
index 65dfb13..a808c64 100644
--- a/core/java/android/net/NetworkCapabilities.java
+++ b/core/java/android/net/NetworkCapabilities.java
@@ -18,6 +18,7 @@
 
 import android.annotation.IntDef;
 import android.annotation.SystemApi;
+import android.annotation.TestApi;
 import android.net.ConnectivityManager.NetworkCallback;
 import android.os.Parcel;
 import android.os.Parcelable;
@@ -427,6 +428,7 @@
      * @return an array of capability values for this instance.
      * @hide
      */
+    @TestApi
     public @NetCapability int[] getCapabilities() {
         return BitUtils.unpackBits(mNetworkCapabilities);
     }
@@ -690,6 +692,7 @@
      * @return an array of transport type values for this instance.
      * @hide
      */
+    @TestApi
     public @Transport int[] getTransportTypes() {
         return BitUtils.unpackBits(mTransportTypes);
     }