diff options
| author | Paul Jensen <pauljensen@google.com> | 2015-09-23 10:59:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-09-23 10:59:31 +0000 |
| commit | ece4ac2105d18d8d7b6296d6de3fdd5641c35258 (patch) | |
| tree | 5830f7b964f49bede7a5fc1b78d58e728827b046 | |
| parent | a9e98343146244b71e236d82c95a8d0fa30a41c1 (diff) | |
| parent | 2b6af396ad14def9a967f62cccc87ee715823bb1 (diff) | |
| download | frameworks_base-ece4ac2105d18d8d7b6296d6de3fdd5641c35258.zip frameworks_base-ece4ac2105d18d8d7b6296d6de3fdd5641c35258.tar.gz frameworks_base-ece4ac2105d18d8d7b6296d6de3fdd5641c35258.tar.bz2 | |
Merge "Don't mark NetworkRequests restricted when they don't have restricted caps" into lmp-dev
| -rw-r--r-- | core/java/android/net/NetworkCapabilities.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/net/NetworkCapabilities.java b/core/java/android/net/NetworkCapabilities.java index 2e22697..04ebc7c 100644 --- a/core/java/android/net/NetworkCapabilities.java +++ b/core/java/android/net/NetworkCapabilities.java @@ -285,8 +285,12 @@ public final class NetworkCapabilities implements Parcelable { public void maybeMarkCapabilitiesRestricted() { // If all the capabilities are typically provided by restricted networks, conclude that this // network is restricted. - if ((mNetworkCapabilities & ~(DEFAULT_CAPABILITIES | RESTRICTED_CAPABILITIES)) == 0) + if ((mNetworkCapabilities & ~(DEFAULT_CAPABILITIES | RESTRICTED_CAPABILITIES)) == 0 && + // Must have at least some restricted capabilities, otherwise a request for an + // internet-less network will get marked restricted. + (mNetworkCapabilities & RESTRICTED_CAPABILITIES) != 0) { removeCapability(NET_CAPABILITY_NOT_RESTRICTED); + } } /** |