Snap for 4784261 from 037834d55772403be181cac74e8d806aa3385ddc to pi-release

Change-Id: If699bf35aa77c7c0aeca814b9c02cf155159fa69
This commit is contained in:
android-build-team Robot
2018-05-16 07:24:30 +00:00

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);
} }
@@ -690,6 +692,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);
} }