Follow removal of NetworkInfo metered flag.

The OS now completely relies on NET_CAPABILITY_NOT_METERED to avoid
confusion and staleness.

Bug: 63391323
Test: builds, boots, Wi-Fi policy is upgraded
Exempt-From-Owner-Approval: Bug 63673347
Change-Id: Iea83e0afd8cbd2be10d85b8a35c903047716b5b9

1 files changed, 7 insertions, 0 deletions

diff --git a/src/com/android/providers/downloads/RealSystemFacade.java b/src/com/android/providers/downloads/RealSystemFacade.java
index df1d245f..1c2ba581 100644
--- a/src/com/android/providers/downloads/RealSystemFacade.java
+++ b/src/com/android/providers/downloads/RealSystemFacade.java
@@ -25,6 +25,7 @@ import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.net.ConnectivityManager;
 import android.net.Network;
+import android.net.NetworkCapabilities;
 import android.net.NetworkInfo;
 import android.security.NetworkSecurityPolicy;
 import android.security.net.config.ApplicationConfig;
@@ -61,6 +62,12 @@ class RealSystemFacade implements SystemFacade {
     }
 
     @Override
+    public boolean isNetworkMetered(Network network) {
+        return !mContext.getSystemService(ConnectivityManager.class).getNetworkCapabilities(network)
+                .hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED);
+    }
+
+    @Override
     public long getMaxBytesOverMobile() {
         final Long value = DownloadManager.getMaxBytesOverMobile(mContext);
         return (value == null) ? Long.MAX_VALUE : value;