diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/ConnectivityManagerTest.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/ConnectivityManagerTest.java index b27c80a0ad..8975dabd3a 100644 --- a/tests/cts/hostside/app/src/com/android/cts/net/hostside/ConnectivityManagerTest.java +++ b/tests/cts/hostside/app/src/com/android/cts/net/hostside/ConnectivityManagerTest.java @@ -80,6 +80,11 @@ public class ConnectivityManagerTest extends InstrumentationTestCase { assertRestrictBackgroundStatus(RESTRICT_BACKGROUND_STATUS_ENABLED); } + public void testRestrictBackgroundChangedNotReceived() throws Exception { + assertRestrictBackgroundChangedReceived(DYNAMIC_RECEIVER, 0); + assertRestrictBackgroundChangedReceived(MANIFEST_RECEIVER, 0); + } + public void testRestrictBackgroundChangedReceivedOnce() throws Exception { assertRestrictBackgroundChangedReceived(DYNAMIC_RECEIVER, 1); assertRestrictBackgroundChangedReceived(MANIFEST_RECEIVER, 0); diff --git a/tests/cts/hostside/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java b/tests/cts/hostside/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java index 2b0b1c16ba..18047406cc 100644 --- a/tests/cts/hostside/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java +++ b/tests/cts/hostside/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java @@ -55,12 +55,13 @@ public class HostsideRestrictBackgroundNetworkTests extends HostsideNetworkTestC public void testGetRestrictBackgroundStatus_disabled() throws Exception { removeRestrictBackgroundWhitelist(mUid); assertRestrictBackgroundStatusDisabled(); - assertRestrictBackgroundChangedReceivedOnce(); + // From the app's point of view, nothing changed, it still have access + assertRestrictBackgroundChangedNotReceived(); // Sanity check: make sure status is always disabled, never whitelisted addRestrictBackgroundWhitelist(mUid); assertRestrictBackgroundStatusDisabled(); - assertRestrictBackgroundChangedReceivedTwice(); + assertRestrictBackgroundChangedNotReceived(); } public void testGetRestrictBackgroundStatus_whitelisted() throws Exception { @@ -78,7 +79,7 @@ public class HostsideRestrictBackgroundNetworkTests extends HostsideNetworkTestC removeRestrictBackgroundWhitelist(mUid); assertRestrictBackgroundStatusEnabled(); - assertRestrictBackgroundChangedReceivedTwice(); + assertRestrictBackgroundChangedReceivedOnce(); } public void testGetRestrictBackgroundStatus_uninstall() throws Exception { @@ -121,6 +122,11 @@ public class HostsideRestrictBackgroundNetworkTests extends HostsideNetworkTestC "testGetRestrictBackgroundStatus_enabled"); } + private void assertRestrictBackgroundChangedNotReceived() throws DeviceNotAvailableException { + runDeviceTests(TEST_PKG, TEST_PKG + ".ConnectivityManagerTest", + "testRestrictBackgroundChangedNotReceived"); + } + private void assertRestrictBackgroundChangedReceivedOnce() throws DeviceNotAvailableException { runDeviceTests(TEST_PKG, TEST_PKG + ".ConnectivityManagerTest", "testRestrictBackgroundChangedReceivedOnce");