diff options
| author | Paul Jensen <pauljensen@google.com> | 2015-07-30 02:20:49 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-30 02:20:49 +0000 |
| commit | 682fd6aedea87e345f033b489ef9f6008bd19c30 (patch) | |
| tree | 1d00ffc67c2b89c820ea8caf4a60f9db0826ff14 /core/java/android/net | |
| parent | 69e7fa8a521a402b4a80aafbca203f66b3323123 (diff) | |
| parent | a991c66c12da30d0240ac6c98736edee93d95977 (diff) | |
| download | frameworks_base-682fd6aedea87e345f033b489ef9f6008bd19c30.zip frameworks_base-682fd6aedea87e345f033b489ef9f6008bd19c30.tar.gz frameworks_base-682fd6aedea87e345f033b489ef9f6008bd19c30.tar.bz2 | |
am a991c66c: Merge "Fix missing onLost NetworkCallbacks when network loses capability" into mnc-dev
* commit 'a991c66c12da30d0240ac6c98736edee93d95977':
Fix missing onLost NetworkCallbacks when network loses capability
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 f988e0b..af2068c 100644 --- a/core/java/android/net/NetworkCapabilities.java +++ b/core/java/android/net/NetworkCapabilities.java @@ -792,6 +792,7 @@ public final class NetworkCapabilities implements Parcelable { case NET_CAPABILITY_TRUSTED: capabilities += "TRUSTED"; break; case NET_CAPABILITY_NOT_VPN: capabilities += "NOT_VPN"; break; case NET_CAPABILITY_VALIDATED: capabilities += "VALIDATED"; break; + case NET_CAPABILITY_CAPTIVE_PORTAL: capabilities += "CAPTIVE_PORTAL"; break; } if (++i < types.length) capabilities += "&"; } |