Use metered firewalls for metered uid policy
Since the underlying code in connectivity manager is moving to metered
firewalls to denote the uid policy for metered restrictions, NPMS can
start using them now.
Rather than having a single PENALTY_BOX, we have separate firewalls for
user and admin imposed restrictions. Once NPMS uses the appropriate
firewalls for these, it does not need to separately convey the blocked
reasons for metered restrictions on uids to the ConnectivityManager.
Flag: com.android.server.net.use_metered_firewall_chains
Test: atest FrameworksServicesTests:NetworkManagementServiceTest
Test: atest FrameworksServicesTests:NetworkPolicyManagerTest
Test: atest CtsHostsideNetworkPolicyTests
Bug: 336693007
Change-Id: I8da11ff663257d3dafcb5e22ae3313a9255ef0a6
diff --git a/services/tests/servicestests/AndroidTest.xml b/services/tests/servicestests/AndroidTest.xml
index 27c522d..b56af87 100644
--- a/services/tests/servicestests/AndroidTest.xml
+++ b/services/tests/servicestests/AndroidTest.xml
@@ -25,6 +25,13 @@
value="/data/local/tmp/cts/content/broken_shortcut.xml" />
</target_preparer>
+ <target_preparer class="com.android.tradefed.targetprep.DeviceSetup">
+ <option name="force-skip-system-props" value="true" />
+ <option name="set-global-setting" key="verifier_engprod" value="1" />
+ <option name="set-global-setting" key="verifier_verify_adb_installs" value="0" />
+ <option name="restore-settings" value="true" />
+ </target_preparer>
+
<target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
<option name="install-arg" value="-t" />
