commit d8c5f462b4cbbd4f846c15c9af8b1b4e65e610f8
author Jeff Sharkey <jsharkey@android.com> Wed Jul 12 11:00:15 2017 -0600
committer Jeff Sharkey <jsharkey@android.com> Fri Jul 14 09:47:31 2017 -0600
tree e13968f613040fe3dc7269a742462b3469b9732d
parent 39dcd1c73bc485f4522a06c8fae8f2f95a70565c

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: No owner was found for changed files.
Change-Id: Ie11dc19f57be234d0e68bba669b2982807654e0d

tests/tests/app.usage/src/android/app/usage/cts/NetworkUsageStatsTest.java

diff --git a/tests/tests/app.usage/src/android/app/usage/cts/NetworkUsageStatsTest.java b/tests/tests/app.usage/src/android/app/usage/cts/NetworkUsageStatsTest.java
index fcb1d5a..b475cea 100644
--- a/tests/tests/app.usage/src/android/app/usage/cts/NetworkUsageStatsTest.java
+++ b/tests/tests/app.usage/src/android/app/usage/cts/NetworkUsageStatsTest.java
@@ -281,7 +281,8 @@
                 exerciseRemoteHost(network, mUrl);
                 mEndTime = System.currentTimeMillis() + mTolerance;
                 success = true;
-                metered = mCm.getNetworkInfo(network).isMetered();
+                metered = !mCm.getNetworkCapabilities(network)
+                        .hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED);
                 synchronized(NetworkUsageStatsTest.this) {
                     NetworkUsageStatsTest.this.notify();
                 }