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

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

Change-Id: Id6af1a9bdb8b1ce2ec740faee620746430c9bb26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Junyu Lai
2022-04-19 10:33:07 +00:00
committed by Automerger Merge Worker
parent 2ee9e5dbb7 70c3d35319
commit 5301fd1488
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; return true;
case MATCH_CARRIER: case MATCH_CARRIER:
case MATCH_MOBILE: case MATCH_MOBILE:
return !template.getSubscriberIds().isEmpty(); return !template.getSubscriberIds().isEmpty()
&& template.getMeteredness() == METERED_YES;
case MATCH_WIFI: case MATCH_WIFI:
if (template.getWifiNetworkKeys().isEmpty() if (template.getWifiNetworkKeys().isEmpty()
&& template.getSubscriberIds().isEmpty()) { && template.getSubscriberIds().isEmpty()) {