diff options
| -rw-r--r-- | api/test-current.txt | 5 | ||||
| -rw-r--r-- | config/hiddenapi-light-greylist.txt | 2 | ||||
| -rw-r--r-- | core/java/android/net/NetworkCapabilities.java | 3 |
3 files changed, 8 insertions, 2 deletions
diff --git a/api/test-current.txt b/api/test-current.txt index cc3528fd5d81..f13e0dede74d 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -605,6 +605,11 @@ package android.net { field public static final int INVALID_SECURITY_PARAMETER_INDEX = 0; // 0x0 } + public final class NetworkCapabilities implements android.os.Parcelable { + method public int[] getCapabilities(); + method public int[] getTransportTypes(); + } + public class TrafficStats { method public static long getLoopbackRxBytes(); method public static long getLoopbackRxPackets(); diff --git a/config/hiddenapi-light-greylist.txt b/config/hiddenapi-light-greylist.txt index 801b070870db..f096dec03600 100644 --- a/config/hiddenapi-light-greylist.txt +++ b/config/hiddenapi-light-greylist.txt @@ -3169,8 +3169,6 @@ Landroid/net/NetworkAgent;->sendNetworkInfo(Landroid/net/NetworkInfo;)V Landroid/net/NetworkCapabilities;-><init>()V Landroid/net/NetworkCapabilities;->addCapability(I)Landroid/net/NetworkCapabilities; Landroid/net/NetworkCapabilities;->addTransportType(I)Landroid/net/NetworkCapabilities; -Landroid/net/NetworkCapabilities;->getCapabilities()[I -Landroid/net/NetworkCapabilities;->getTransportTypes()[I Landroid/net/NetworkCapabilities;->mNetworkCapabilities:J Landroid/net/NetworkCapabilities;->mSignalStrength:I Landroid/net/NetworkCapabilities;->removeCapability(I)Landroid/net/NetworkCapabilities; diff --git a/core/java/android/net/NetworkCapabilities.java b/core/java/android/net/NetworkCapabilities.java index 319dfa56d21f..bac2e90d57ea 100644 --- a/core/java/android/net/NetworkCapabilities.java +++ b/core/java/android/net/NetworkCapabilities.java @@ -18,6 +18,7 @@ package android.net; 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 @@ public final class NetworkCapabilities implements Parcelable { * @return an array of capability values for this instance. * @hide */ + @TestApi public @NetCapability int[] getCapabilities() { return BitUtils.unpackBits(mNetworkCapabilities); } @@ -691,6 +693,7 @@ public final class NetworkCapabilities implements Parcelable { * @return an array of transport type values for this instance. * @hide */ + @TestApi public @Transport int[] getTransportTypes() { return BitUtils.unpackBits(mTransportTypes); } |