diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2015-05-19 10:29:46 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-19 10:29:48 +0000 |
| commit | aba6cccd40e0393d7bcff7f6edb5ca8cfdd4c7b1 (patch) | |
| tree | 6f8c9b82fb9c1b831c06537d114d227135e4d95a /core/java/android/net | |
| parent | 3e5484d452cdf9f98e3c0e1abfe4a7297753cb5e (diff) | |
| parent | 76f67797032981ccb63e12e808ebc8bda636a740 (diff) | |
| download | frameworks_base-aba6cccd40e0393d7bcff7f6edb5ca8cfdd4c7b1.zip frameworks_base-aba6cccd40e0393d7bcff7f6edb5ca8cfdd4c7b1.tar.gz frameworks_base-aba6cccd40e0393d7bcff7f6edb5ca8cfdd4c7b1.tar.bz2 | |
Merge "Make NET_CAPABILITY_VALIDATED (almost) a first-class citizen." into mnc-dev
Diffstat (limited to 'core/java/android/net')
| -rw-r--r-- | core/java/android/net/NetworkCapabilities.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/net/NetworkCapabilities.java b/core/java/android/net/NetworkCapabilities.java index ab70485..cf747cf 100644 --- a/core/java/android/net/NetworkCapabilities.java +++ b/core/java/android/net/NetworkCapabilities.java @@ -619,6 +619,7 @@ public final class NetworkCapabilities implements Parcelable { case NET_CAPABILITY_NOT_RESTRICTED: capabilities += "NOT_RESTRICTED"; break; case NET_CAPABILITY_TRUSTED: capabilities += "TRUSTED"; break; case NET_CAPABILITY_NOT_VPN: capabilities += "NOT_VPN"; break; + case NET_CAPABILITY_VALIDATED: capabilities += "VALIDATED"; break; } if (++i < types.length) capabilities += "&"; } |