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

Merge "Don't require WiFi in CtsHostsideNetworkTests." am: b974f51473 am: 056ecd792f am: ebc6cbc693 am: edab8c8a50

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/cts/+/1373016

Change-Id: I96db1314dff1c573396e94d4fb99e8a70f06a36b
This commit is contained in:
Treehugger Robot
2020-09-01 10:42:33 +00:00
committed by Automerger Merge Worker
parent ae544287e4 edab8c8a50
commit 4cd324ddba
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/cts/hostside/app/src/com/android/cts/net/hostside/NetworkCallbackTest.java
View File

@@ -17,7 +17,9 @@
package com.android.cts.net.hostside; package com.android.cts.net.hostside;
import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_METERED; import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_METERED;
import static com.android.cts.net.hostside.NetworkPolicyTestUtils.canChangeActiveNetworkMeteredness;
import static com.android.cts.net.hostside.NetworkPolicyTestUtils.setRestrictBackground; import static com.android.cts.net.hostside.NetworkPolicyTestUtils.setRestrictBackground;
import static com.android.cts.net.hostside.NetworkPolicyTestUtils.isActiveNetworkMetered;
import static com.android.cts.net.hostside.Property.BATTERY_SAVER_MODE; import static com.android.cts.net.hostside.Property.BATTERY_SAVER_MODE;
import static com.android.cts.net.hostside.Property.DATA_SAVER_MODE; import static com.android.cts.net.hostside.Property.DATA_SAVER_MODE;
@@ -26,6 +28,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull; import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
import static org.junit.Assume.assumeTrue;
import android.net.Network; import android.net.Network;
import android.net.NetworkCapabilities; import android.net.NetworkCapabilities;
@@ -183,6 +186,8 @@ public class NetworkCallbackTest extends AbstractRestrictBackgroundNetworkTestCa
public void setUp() throws Exception { public void setUp() throws Exception {
super.setUp(); super.setUp();
assumeTrue(isActiveNetworkMetered(true) || canChangeActiveNetworkMeteredness());
registerBroadcastReceiver(); registerBroadcastReceiver();
removeRestrictBackgroundWhitelist(mUid); removeRestrictBackgroundWhitelist(mUid);