Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix NetworkTemplate generates non-metered carrier template" am: 70c3d35319 am: 5301fd1488 am: 1361b459c9 am: 7fa2bca312 am: b22d36f2ca

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

Change-Id: Ia846b0f12ac7dc2b1342906951a10eaf66434417
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Junyu Lai
2022-04-20 11:53:55 +00:00
committed by Automerger Merge Worker
parent 95ff517c89 b22d36f2ca
commit 54b2f2a663
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/net/NetworkPolicy.java
View File

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