commit fbc5d5d58839f4513e99f00db3c1157b235a41bc
author Lucas Lin <lucaslin@google.com> Tue Jun 22 03:16:30 2021 +0000
committer Lucas Lin <lucaslin@google.com> Tue Jun 22 05:46:59 2021 +0000
tree ccc02d462bff4a1144a534c4e1201429cfbf4237
parent cc057784c124e900bb2158df050b9f88acd93c15

Add OBSERVE_NETWORK_POLICY for shell to test CTS

Both of NetworkPolicyManager#isUidNetworkingBlocked() and
NetworkPolicyManager#isUidRestrictedOnMeteredNetworks() are
required OBSERVE_NETWORK_POLICY but OBSERVE_NETWORK_POLICY is a
signature permission that CTS cannot acquire.
So add this permission for shell and call these 2 APIs with
shell identity to fix the problem.

Bug: 176289731
Test: atest CtsHostsideNetworkTests:HostsideNetworkPolicyManagerTests
Original-Change: https://android-review.googlesource.com/1737413
Merged-In: Iba7321c82e1a3ed773f99ccd4b9e3c24c607353f
Change-Id: Iba7321c82e1a3ed773f99ccd4b9e3c24c607353f

packages/Shell/AndroidManifest.xml

diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml
index 959b5ca..f7123c1 100644
--- a/packages/Shell/AndroidManifest.xml
+++ b/packages/Shell/AndroidManifest.xml
@@ -419,6 +419,9 @@
     <!-- Permission required for running networking unit tests -->
     <uses-permission android:name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS" />
 
+    <!-- Permission required for CTS test - CtsHostsideNetworkTests -->
+    <uses-permission android:name="android.permission.OBSERVE_NETWORK_POLICY" />
+
     <!-- Permissions required for CTS test - TunerTest -->
     <uses-permission android:name="android.permission.ACCESS_TV_DESCRAMBLER" />
     <uses-permission android:name="android.permission.ACCESS_TV_TUNER" />