LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Use ConnectionManager API to check if network is metered." into nyc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-05-25 16:54:25 +00:00
committed by Android (Google) Code Review
parent 94636121f1 68471ef930
commit b853005f3c
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java
View File

@@ -403,7 +403,7 @@ abstract class AbstractRestrictBackgroundNetworkTestCase extends Instrumentation
} else { } else {
final NetworkInfo info = mCm.getActiveNetworkInfo(); final NetworkInfo info = mCm.getActiveNetworkInfo();
assertNotNull("Could not get active network", info); assertNotNull("Could not get active network", info);
if (!info.isMetered()) { if (!mCm.isActiveNetworkMetered()) {
Log.d(TAG, "Active network is not metered: " + info); Log.d(TAG, "Active network is not metered: " + info);
} else if (info.getType() == ConnectivityManager.TYPE_WIFI) { } else if (info.getType() == ConnectivityManager.TYPE_WIFI) {
Log.i(TAG, "Setting active WI-FI network as metered: " + info ); Log.i(TAG, "Setting active WI-FI network as metered: " + info );
@@ -415,9 +415,21 @@ abstract class AbstractRestrictBackgroundNetworkTestCase extends Instrumentation
assertActiveNetworkMetered(false); // Sanity check. assertActiveNetworkMetered(false); // Sanity check.
} }
private void assertActiveNetworkMetered(boolean expected) { private void assertActiveNetworkMetered(boolean expected) throws Exception {
final NetworkInfo info = mCm.getActiveNetworkInfo(); final int maxTries = 5;
assertEquals("Wrong metered status for active network " + info, expected, info.isMetered()); NetworkInfo info = null;
for (int i = 1; i <= maxTries; i++) {
info = mCm.getActiveNetworkInfo();
if (info != null) {
break;
}
Log.v(TAG, "No active network info on attempt #" + i
+ "; sleeping 1s before polling again");
Thread.sleep(SECOND_IN_MS);
}
assertNotNull("No active network after " + maxTries + " attempts", info);
assertEquals("Wrong metered status for active network " + info, expected,
mCm.isActiveNetworkMetered());
} }
private String setWifiMeteredStatus(boolean metered) throws Exception { private String setWifiMeteredStatus(boolean metered) throws Exception {