Update usage of allowlist/denylist in some method names/comments.
In a previous change (https://r.android.com/1394342), we did a mass update of whitelist->allowlist and blacklist->denylist in network policy related code. Updating some usages of those (like allowlisted to allowed) to make them sound natural. Test: atest services/tests/servicestests/src/com/android/server/net/NetworkPolicyManagerServiceTest.java Test: atest services/tests/servicestests/src/com/android/server/NetworkManagementInternalTest.java Test: atest hostsidetests/net/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java Change-Id: I6d34b0bd3cdb64d5872874fd9378bfc962a24f8d
This commit is contained in:
@@ -235,23 +235,23 @@ public class NetworkManagementServiceTest {
|
||||
doReturn(true).when(mNetdService).bandwidthEnableDataSaver(anyBoolean());
|
||||
|
||||
// Restrict usage of mobile data in background
|
||||
mNMService.setUidMeteredNetworkDenylist(TEST_UID, true);
|
||||
mNMService.setUidOnMeteredNetworkDenylist(TEST_UID, true);
|
||||
assertTrue("Should be true since mobile data usage is restricted",
|
||||
mNMService.isNetworkRestricted(TEST_UID));
|
||||
|
||||
mNMService.setDataSaverModeEnabled(true);
|
||||
verify(mNetdService).bandwidthEnableDataSaver(true);
|
||||
|
||||
mNMService.setUidMeteredNetworkDenylist(TEST_UID, false);
|
||||
mNMService.setUidOnMeteredNetworkDenylist(TEST_UID, false);
|
||||
assertTrue("Should be true since data saver is on and the uid is not allowlisted",
|
||||
mNMService.isNetworkRestricted(TEST_UID));
|
||||
|
||||
mNMService.setUidMeteredNetworkAllowlist(TEST_UID, true);
|
||||
mNMService.setUidOnMeteredNetworkAllowlist(TEST_UID, true);
|
||||
assertFalse("Should be false since data saver is on and the uid is allowlisted",
|
||||
mNMService.isNetworkRestricted(TEST_UID));
|
||||
|
||||
// remove uid from allowlist and turn datasaver off again
|
||||
mNMService.setUidMeteredNetworkAllowlist(TEST_UID, false);
|
||||
mNMService.setUidOnMeteredNetworkAllowlist(TEST_UID, false);
|
||||
mNMService.setDataSaverModeEnabled(false);
|
||||
verify(mNetdService).bandwidthEnableDataSaver(false);
|
||||
assertFalse("Network should not be restricted when data saver is off",
|
||||
|
||||
Reference in New Issue
Block a user