diff options
| author | Robert Horvath <robhor@google.com> | 2022-02-10 11:17:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-02-10 11:17:44 +0000 |
| commit | 3a334959929659dcf72b1d9b76dab6417103c6ca (patch) | |
| tree | 54d4df8e3464b8a3d54022a85fb46d8b4d915094 /tests/unit/java/com/android/server/NetworkManagementServiceTest.java | |
| parent | d54fcc49a723b1b39792dcb6954185869d39684d (diff) | |
| parent | aa197190c616a75fa28a2b22ad893e64a43cf68f (diff) | |
Merge "Add Low Power Standby test to NetworkManagementServiceTest"
Diffstat (limited to 'tests/unit/java/com/android/server/NetworkManagementServiceTest.java')
| -rw-r--r-- | tests/unit/java/com/android/server/NetworkManagementServiceTest.java | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/tests/unit/java/com/android/server/NetworkManagementServiceTest.java b/tests/unit/java/com/android/server/NetworkManagementServiceTest.java index 0c58582ce9..a3b0e7c8ab 100644 --- a/tests/unit/java/com/android/server/NetworkManagementServiceTest.java +++ b/tests/unit/java/com/android/server/NetworkManagementServiceTest.java @@ -16,6 +16,11 @@ package com.android.server; +import static android.net.ConnectivityManager.FIREWALL_CHAIN_DOZABLE; +import static android.net.ConnectivityManager.FIREWALL_CHAIN_LOW_POWER_STANDBY; +import static android.net.ConnectivityManager.FIREWALL_CHAIN_POWERSAVE; +import static android.net.ConnectivityManager.FIREWALL_CHAIN_RESTRICTED; +import static android.net.ConnectivityManager.FIREWALL_CHAIN_STANDBY; import static android.util.DebugUtils.valueToString; import static org.junit.Assert.assertEquals; @@ -277,31 +282,38 @@ public class NetworkManagementServiceTest { isRestrictedForDozable.put(NetworkPolicyManager.FIREWALL_RULE_DEFAULT, true); isRestrictedForDozable.put(INetd.FIREWALL_RULE_ALLOW, false); isRestrictedForDozable.put(INetd.FIREWALL_RULE_DENY, true); - expected.put(INetd.FIREWALL_CHAIN_DOZABLE, isRestrictedForDozable); + expected.put(FIREWALL_CHAIN_DOZABLE, isRestrictedForDozable); // Powersaver chain final ArrayMap<Integer, Boolean> isRestrictedForPowerSave = new ArrayMap<>(); isRestrictedForPowerSave.put(NetworkPolicyManager.FIREWALL_RULE_DEFAULT, true); isRestrictedForPowerSave.put(INetd.FIREWALL_RULE_ALLOW, false); isRestrictedForPowerSave.put(INetd.FIREWALL_RULE_DENY, true); - expected.put(INetd.FIREWALL_CHAIN_POWERSAVE, isRestrictedForPowerSave); + expected.put(FIREWALL_CHAIN_POWERSAVE, isRestrictedForPowerSave); // Standby chain final ArrayMap<Integer, Boolean> isRestrictedForStandby = new ArrayMap<>(); isRestrictedForStandby.put(NetworkPolicyManager.FIREWALL_RULE_DEFAULT, false); isRestrictedForStandby.put(INetd.FIREWALL_RULE_ALLOW, false); isRestrictedForStandby.put(INetd.FIREWALL_RULE_DENY, true); - expected.put(INetd.FIREWALL_CHAIN_STANDBY, isRestrictedForStandby); + expected.put(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); + expected.put(FIREWALL_CHAIN_RESTRICTED, isRestrictedForRestrictedMode); + // Low Power Standby chain + final ArrayMap<Integer, Boolean> isRestrictedForLowPowerStandby = new ArrayMap<>(); + isRestrictedForLowPowerStandby.put(NetworkPolicyManager.FIREWALL_RULE_DEFAULT, true); + isRestrictedForLowPowerStandby.put(INetd.FIREWALL_RULE_ALLOW, false); + isRestrictedForLowPowerStandby.put(INetd.FIREWALL_RULE_DENY, true); + expected.put(FIREWALL_CHAIN_LOW_POWER_STANDBY, isRestrictedForLowPowerStandby); final int[] chains = { - INetd.FIREWALL_CHAIN_STANDBY, - INetd.FIREWALL_CHAIN_POWERSAVE, - INetd.FIREWALL_CHAIN_DOZABLE, - INetd.FIREWALL_CHAIN_RESTRICTED + FIREWALL_CHAIN_STANDBY, + FIREWALL_CHAIN_POWERSAVE, + FIREWALL_CHAIN_DOZABLE, + FIREWALL_CHAIN_RESTRICTED, + FIREWALL_CHAIN_LOW_POWER_STANDBY }; final int[] states = { INetd.FIREWALL_RULE_ALLOW, |