diff options
| author | Aaron Huang <huangaaron@google.com> | 2021-10-26 12:17:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-10-26 12:17:23 +0000 |
| commit | 104d96f9d83f25deca3cb9dc620b86cd0e5315d2 (patch) | |
| tree | 3a92ddfd4377cc6e084daa137268836333768f27 | |
| parent | 67dccd5e649e615f04d373bb4868a78984a04689 (diff) | |
| parent | 94d684fb9cd47ca7737969cd236604955f521beb (diff) | |
| download | base-104d96f9d83f25deca3cb9dc620b86cd0e5315d2.tar.gz | |
Merge "Adapt NET_CAPABILITY_TEMPORARILY_NOT_METERED in NetworkIdentity"
| -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()); |