| commit | e999899287ed4205643b70f8cc58a9e574d51bc1 | [log] [tgz] |
|---|---|---|
| author | Chalard Jean <jchalard@google.com> | Fri Mar 02 13:10:45 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Mar 02 13:10:45 2018 +0000 |
| tree | bba4046a14f54e09f60fd30ed74f5d65bf48dba8 | |
| parent | 58c3355b8f10d9b50d08337c2242c9c6329c1457 [diff] | |
| parent | dce4d4ca32cf48b2b7bdd7ea36ce7e30a9c5b3cc [diff] |
Merge "Give apps with NETWORK_SETTINGS right to see any VPN." am: dce4d4ca32 Change-Id: Iab9c8df6071e6dec35b5f492eb8344ba370e0036
diff --git a/core/java/android/net/NetworkCapabilities.java b/core/java/android/net/NetworkCapabilities.java index b899cbf..785b040 100644 --- a/core/java/android/net/NetworkCapabilities.java +++ b/core/java/android/net/NetworkCapabilities.java
@@ -21,6 +21,7 @@ import android.os.Parcel; import android.os.Parcelable; import android.util.ArraySet; +import android.util.proto.ProtoOutputStream; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.BitUtils;