From 660722501f2f771acec02dace3ba3aec4ee197ab Mon Sep 17 00:00:00 2001 From: Patrick Rohr Date: Thu, 19 Nov 2020 11:28:13 +0100 Subject: [PATCH] Add Restricted Mode Firewall Chain Adding new allowlist firewall chain to support restricted networking mode. See go/restricted-networking-mode. Bug: b/157505406 Bug: b/170323408 Test: atest NetworkManagementServiceTest Change-Id: I8e39b3d7b129ad74224d0c1311135b7b48f6514f --- .../com/android/server/NetworkManagementServiceTest.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/net/java/com/android/server/NetworkManagementServiceTest.java b/tests/net/java/com/android/server/NetworkManagementServiceTest.java index b8b5886951..ea763d2e93 100644 --- a/tests/net/java/com/android/server/NetworkManagementServiceTest.java +++ b/tests/net/java/com/android/server/NetworkManagementServiceTest.java @@ -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 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,