Merge "Revert consider TEMPORARILY_NOT_METERED as unmetered in data usage"

This commit is contained in:
Treehugger Robot
2022-12-02 11:27:27 +00:00
committed by Gerrit Code Review
5 changed files with 11 additions and 17 deletions

View File

@@ -400,10 +400,8 @@ public class NetworkIdentity {
setSubscriberId(snapshot.getSubscriberId());
setRoaming(!snapshot.getNetworkCapabilities().hasCapability(
NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING));
setMetered(!(snapshot.getNetworkCapabilities().hasCapability(
NetworkCapabilities.NET_CAPABILITY_NOT_METERED)
|| snapshot.getNetworkCapabilities().hasCapability(
NetworkCapabilities.NET_CAPABILITY_TEMPORARILY_NOT_METERED)));
setMetered(!snapshot.getNetworkCapabilities().hasCapability(
NetworkCapabilities.NET_CAPABILITY_NOT_METERED));
setOemManaged(getOemBitfield(snapshot.getNetworkCapabilities()));