LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Let tests enumerate all transports/capabilities." into pi-dev

Browse Source 
am: 8e6445a1a5

Change-Id: Ie5cd22cfa2b6a60510fd1e31d7ebcd8f6cc890a0
This commit is contained in:
Jeff Sharkey
2018-05-15 08:27:40 -07:00
committed by android-build-merger
parent a642bf55db 7b6ed22507
commit eb25084c11
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/net/NetworkCapabilities.java
View File

@@ -18,6 +18,7 @@ package android.net;
import android.annotation.IntDef; import android.annotation.IntDef;
import android.annotation.SystemApi; import android.annotation.SystemApi;
import android.annotation.TestApi;
import android.net.ConnectivityManager.NetworkCallback; import android.net.ConnectivityManager.NetworkCallback;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
@@ -427,6 +428,7 @@ public final class NetworkCapabilities implements Parcelable {
* @return an array of capability values for this instance. * @return an array of capability values for this instance.
* @hide * @hide
*/ */
@TestApi
public @NetCapability int[] getCapabilities() { public @NetCapability int[] getCapabilities() {
return BitUtils.unpackBits(mNetworkCapabilities); return BitUtils.unpackBits(mNetworkCapabilities);
} }
@@ -691,6 +693,7 @@ public final class NetworkCapabilities implements Parcelable {
* @return an array of transport type values for this instance. * @return an array of transport type values for this instance.
* @hide * @hide
*/ */
@TestApi
public @Transport int[] getTransportTypes() { public @Transport int[] getTransportTypes() {
return BitUtils.unpackBits(mTransportTypes); return BitUtils.unpackBits(mTransportTypes);
} }