diff options
| author | Paul Jensen <pauljensen@google.com> | 2015-07-30 02:10:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-30 02:10:50 +0000 |
| commit | a991c66c12da30d0240ac6c98736edee93d95977 (patch) | |
| tree | 9a787139c985ee3cb0e242527e744e44da094249 /core | |
| parent | 8d3a67a8d475b43cbac50a2a186a19f4a29c7892 (diff) | |
| parent | cf4c2c637268b1a2979e20a8b5644916777a02a4 (diff) | |
| download | frameworks_base-a991c66c12da30d0240ac6c98736edee93d95977.zip frameworks_base-a991c66c12da30d0240ac6c98736edee93d95977.tar.gz frameworks_base-a991c66c12da30d0240ac6c98736edee93d95977.tar.bz2 | |
Merge "Fix missing onLost NetworkCallbacks when network loses capability" into mnc-dev
Diffstat (limited to 'core')
| -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 514d24a..651fb35 100644 --- a/core/java/android/net/NetworkCapabilities.java +++ b/core/java/android/net/NetworkCapabilities.java @@ -626,6 +626,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 += "&"; } |