Merge "Update usage of allowlist/denylist in some method names/comments." am: e1dc77b743 am: f316b89f93

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1402789

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I97e8af4a71f23438e830b1a44834719b7c488d67
This commit is contained in:
Sudheer Shanka
2020-12-24 09:36:33 +00:00
committed by Automerger Merge Worker

View File

@@ -234,23 +234,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",