diff options
| author | Junyu Lai <junyulai@google.com> | 2022-04-20 06:08:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-20 06:08:15 +0000 |
| commit | 7fa2bca312123e9be80720e1aded6cae01d208f8 (patch) | |
| tree | 98aff50846e4ed87445c8e528231e1321fff76e4 /core/java/android | |
| parent | f73f3203c20b8512acb8a7571f74b363595525a0 (diff) | |
| parent | 1361b459c98ee1bceca42dfe229e79cf7851c623 (diff) | |
Merge "Fix NetworkTemplate generates non-metered carrier template" am: 70c3d35319 am: 5301fd1488 am: 1361b459c9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2065438
Change-Id: Ieabb4c07554b129308bdbeddf92376193df36870
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/net/NetworkPolicy.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/net/NetworkPolicy.java b/core/java/android/net/NetworkPolicy.java index 714227d87aeb..570211ecc88d 100644 --- a/core/java/android/net/NetworkPolicy.java +++ b/core/java/android/net/NetworkPolicy.java @@ -396,7 +396,8 @@ public class NetworkPolicy implements Parcelable, Comparable<NetworkPolicy> { return true; case MATCH_CARRIER: case MATCH_MOBILE: - return !template.getSubscriberIds().isEmpty(); + return !template.getSubscriberIds().isEmpty() + && template.getMeteredness() == METERED_YES; case MATCH_WIFI: if (template.getWifiNetworkKeys().isEmpty() && template.getSubscriberIds().isEmpty()) { |