commit 481b2649f72bef8309283a8cb1f4f96643e62ffb
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 2fb4675bcf20f2461687b2af126b82edf3ab2172
parent 8315d1cf031e67216072e4138c5ea7e14a46d555
parent 74f7c8c90770ff95b0a07e5e731986489120591a

Merge "Fix NetworkTemplate generates non-metered carrier template"

framework-t/src/android/net/NetworkTemplate.java

diff --git a/framework-t/src/android/net/NetworkTemplate.java b/framework-t/src/android/net/NetworkTemplate.java
index 7b5afd7..b82a126 100644
--- a/framework-t/src/android/net/NetworkTemplate.java
+++ b/framework-t/src/android/net/NetworkTemplate.java
@@ -393,8 +393,9 @@
         //constructor passes METERED_YES for these types.
         this(matchRule, subscriberId, matchSubscriberIds,
                 wifiNetworkKey != null ? new String[] { wifiNetworkKey } : new String[0],
-                (matchRule == MATCH_MOBILE || matchRule == MATCH_MOBILE_WILDCARD) ? METERED_YES
-                : METERED_ALL , ROAMING_ALL, DEFAULT_NETWORK_ALL, NETWORK_TYPE_ALL,
+                (matchRule == MATCH_MOBILE || matchRule == MATCH_MOBILE_WILDCARD
+                        || matchRule == MATCH_CARRIER) ? METERED_YES : METERED_ALL,
+                ROAMING_ALL, DEFAULT_NETWORK_ALL, NETWORK_TYPE_ALL,
                 OEM_MANAGED_ALL, NetworkStatsUtils.SUBSCRIBER_ID_MATCH_RULE_EXACT);
     }