joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge changes from topic "restricted-networking-mode" am: 1d156cb04e am: 83711b9a0b

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

Change-Id: I1ae2656e91f1fa6b35ea34177496bd9ad23daceb
This commit is contained in:
Patrick Rohr 2020-12-03 11:51:32 +00:00 • committed by Automerger Merge Worker
commit 5fda0bd0af
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
tests/net/java/com/android/server/NetworkManagementServiceTest.java
View file

@ -279,11 +279,18 @@ public class NetworkManagementServiceTest {
isRestrictedForStandby.put(INetd.FIREWALL_RULE_ALLOW, false);
isRestrictedForStandby.put(INetd.FIREWALL_RULE_DENY, true);
expected.put(INetd.FIREWALL_CHAIN_STANDBY, isRestrictedForStandby);
// Restricted mode chain
final ArrayMap<Integer, Boolean> isRestrictedForRestrictedMode = new ArrayMap<>();
isRestrictedForRestrictedMode.put(NetworkPolicyManager.FIREWALL_RULE_DEFAULT, true);
isRestrictedForRestrictedMode.put(INetd.FIREWALL_RULE_ALLOW, false);
isRestrictedForRestrictedMode.put(INetd.FIREWALL_RULE_DENY, true);
expected.put(INetd.FIREWALL_CHAIN_RESTRICTED, isRestrictedForRestrictedMode);
final int[] chains = {
INetd.FIREWALL_CHAIN_STANDBY,
INetd.FIREWALL_CHAIN_POWERSAVE,
INetd.FIREWALL_CHAIN_DOZABLE
INetd.FIREWALL_CHAIN_DOZABLE,
INetd.FIREWALL_CHAIN_RESTRICTED
};
final int[] states = {
INetd.FIREWALL_RULE_ALLOW,