Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70c3d353 authored by Junyu Lai's avatar Junyu Lai Committed by Gerrit Code Review
Browse files

Merge "Fix NetworkTemplate generates non-metered carrier template"

parents bf7ab279 14ac19c7

core/java/android/net/NetworkPolicy.java

+2 −1
Original line number Diff line number Diff line
@@ -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()) {