Merge "Fix NetworkTemplate generates non-metered carrier template"

2022-04-19 10:18:26 +00:00
parent bf7ab279a6 14ac19c709
commit 70c3d35319
1 changed files with 2 additions and 1 deletions
--- 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()) {