diff options
| author | Aaron Huang <huangaaron@google.com> | 2021-10-26 12:45:49 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-26 12:45:49 +0000 |
| commit | 80051388f23ac8dd3003e0bd78cc7148dcd4725d (patch) | |
| tree | 8f9e7c4da7ce1501d967bbe39267325ac7b4e5a2 /core/java/android | |
| parent | 812ab290026ac6cf5d7b9d67ab4e2b05e235c233 (diff) | |
| parent | 460af8c9c21dcda132e94f402c642dc7f90cd6cd (diff) | |
Merge "Adapt NET_CAPABILITY_TEMPORARILY_NOT_METERED in NetworkIdentity" am: 104d96f9d8 am: 460af8c9c2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1695310
Change-Id: I58ca7ab8ba7678adbca160795cc0cb06a08fd5ed
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/net/NetworkIdentity.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/net/NetworkIdentity.java b/core/java/android/net/NetworkIdentity.java index 1d07a0330bc5..eb8f43e3d073 100644 --- a/core/java/android/net/NetworkIdentity.java +++ b/core/java/android/net/NetworkIdentity.java @@ -220,8 +220,10 @@ public class NetworkIdentity implements Comparable<NetworkIdentity> { String networkId = null; boolean roaming = !snapshot.getNetworkCapabilities().hasCapability( NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING); - boolean metered = !snapshot.getNetworkCapabilities().hasCapability( - NetworkCapabilities.NET_CAPABILITY_NOT_METERED); + boolean metered = !(snapshot.getNetworkCapabilities().hasCapability( + NetworkCapabilities.NET_CAPABILITY_NOT_METERED) + || snapshot.getNetworkCapabilities().hasCapability( + NetworkCapabilities.NET_CAPABILITY_TEMPORARILY_NOT_METERED)); final int oemManaged = getOemBitfield(snapshot.getNetworkCapabilities()); |