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

Merge "Testing Data Saver changed broadcast on unsupported devices." into qt-dev

Browse Source 
am: 42f325acb9

Change-Id: If94305b8d2a8b877af585f0c209538b2b2827a7a
This commit is contained in:
Kweku Adams
2019-05-03 07:52:00 -07:00
committed by android-build-merger
parent a856348e4c 42f325acb9
commit eb7b9bab13
3 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -204,7 +204,7 @@ abstract class AbstractRestrictBackgroundNetworkTestCase extends Instrumentation
do {
attempts++;
count = getNumberBroadcastsReceived(receiverName, ACTION_RESTRICT_BACKGROUND_CHANGED);
if (count == expectedCount) {
if (count >= expectedCount) {
break;
}
Log.d(TAG, "Expecting count " + expectedCount + " but actual is " + count + " after "

17
tests/cts/hostside/app/src/com/android/cts/net/hostside/DataSaverModeTest.java
View File

@@ -22,6 +22,8 @@ import static android.net.ConnectivityManager.RESTRICT_BACKGROUND_STATUS_WHITELI
import android.util.Log;
import com.android.compatibility.common.util.CddTest;
public class DataSaverModeTest extends AbstractRestrictBackgroundNetworkTestCase {
private static final String[] REQUIRED_WHITELISTED_PACKAGES = {
@@ -35,7 +37,6 @@ public class DataSaverModeTest extends AbstractRestrictBackgroundNetworkTestCase
super.setUp();
mIsDataSaverSupported = isDataSaverSupported();
if (!isSupported()) return;
// Set initial state.
setRestrictBackground(false);
@@ -201,6 +202,20 @@ public class DataSaverModeTest extends AbstractRestrictBackgroundNetworkTestCase
}
}
@CddTest(requirement="7.4.7/C-2-2")
public void testBroadcastNotSentOnUnsupportedDevices() throws Exception {
if (isSupported()) return;
setRestrictBackground(true);
assertRestrictBackgroundChangedReceived(0);
setRestrictBackground(false);
assertRestrictBackgroundChangedReceived(0);
setRestrictBackground(true);
assertRestrictBackgroundChangedReceived(0);
}
private void assertDataSaverStatusOnBackground(int expectedStatus) throws Exception {
assertRestrictBackgroundStatus(expectedStatus);
assertBackgroundNetworkAccess(expectedStatus != RESTRICT_BACKGROUND_STATUS_ENABLED);

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

@@ -81,6 +81,11 @@ public class HostsideRestrictBackgroundNetworkTests extends HostsideNetworkTestC
"testGetRestrictBackgroundStatus_requiredWhitelistedPackages");
}
public void testDataSaverMode_broadcastNotSentOnUnsupportedDevices() throws Exception {
runDeviceTests(TEST_PKG, TEST_PKG + ".DataSaverModeTest",
"testBroadcastNotSentOnUnsupportedDevices");
}
/*****************************
* Battery Saver Mode tests. *
*****************************/