commit 70c3d353193a95847094c013d825fe06f34f7418
author Junyu Lai <junyulai@google.com> Tue Apr 19 10:18:26 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 19 10:18:26 2022 +0000
tree 93d7e231a96350d4722e1054c0855677a5c14a80
parent bf7ab279a6d883cdbb5b43889106ef406904311b
parent 14ac19c709096c84be1e7c8769e4bf241f02a4e1

Merge "Fix NetworkTemplate generates non-metered carrier template"

core/java/android/net/NetworkPolicy.java

diff --git a/core/java/android/net/NetworkPolicy.java b/core/java/android/net/NetworkPolicy.java
index 4b35b0d..16ad0b8 100644
--- a/core/java/android/net/NetworkPolicy.java
+++ b/core/java/android/net/NetworkPolicy.java
@@ -396,7 +396,8 @@
                 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()) {