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

Merge "Adapt NET_CAPABILITY_TEMPORARILY_NOT_METERED in NetworkIdentity" am: 104d96f9d8 am: 460af8c9c2 am: 80051388f2 am: 7eacc01ba0

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

Change-Id: Ia0741344c16ac6cd6915de68e8c938b0a1334668
This commit is contained in:
Aaron Huang
2021-10-26 13:10:32 +00:00
committed by Automerger Merge Worker
parent 0e94c574ec 7eacc01ba0
commit 5a87b681d4
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/net/NetworkIdentity.java
View File

@@ -220,8 +220,10 @@ public class NetworkIdentity implements Comparable<NetworkIdentity> {
String networkId = null; String networkId = null;
boolean roaming = !snapshot.getNetworkCapabilities().hasCapability( boolean roaming = !snapshot.getNetworkCapabilities().hasCapability(
NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING); NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING);
boolean metered = !snapshot.getNetworkCapabilities().hasCapability( boolean metered = !(snapshot.getNetworkCapabilities().hasCapability(
NetworkCapabilities.NET_CAPABILITY_NOT_METERED); NetworkCapabilities.NET_CAPABILITY_NOT_METERED)
|| snapshot.getNetworkCapabilities().hasCapability(
NetworkCapabilities.NET_CAPABILITY_TEMPORARILY_NOT_METERED));
final int oemManaged = getOemBitfield(snapshot.getNetworkCapabilities()); final int oemManaged = getOemBitfield(snapshot.getNetworkCapabilities());