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

Commit e1e5e62b authored by Junyu Lai's avatar Junyu Lai Committed by Automerger Merge Worker
Browse files

Merge "Fix NetworkTemplate generates non-metered carrier template" am:... 

Merge "Fix NetworkTemplate generates non-metered carrier template" am: 70c3d353 am: 5301fd14 am: 1361b459 am: 7fa2bca3 am: b22d36f2 am: 54b2f2a6

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2065438



Change-Id: Ib1fbae277f16c4f4740607e2cb85b225a60c590d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ec66ade0 54b2f2a6

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()) {