commit 0af7a8adda49f72a9c9d9eb90796e265b2303d80
author Remi NGUYEN VAN <reminv@google.com> Mon Sep 07 11:22:32 2020 +0900
committer Remi NGUYEN VAN <reminv@google.com> Mon Sep 07 11:22:32 2020 +0900
tree 7f2cbb4599ec98b7df4d02af136f612a1ad0a886
parent cc75b7ae3e39a6e4a510086c0859069545a54db4

usesCleartextTraffic in NetworkPermissionConfig

NetworkPermissionConfig does not need this flag (it has no code), but
all modules using the NetworkStack UID should declare this flag to avoid
races applying security policies.

Bug: 161860610
Test: m
Change-Id: Icf64fbc9273ba678d3ebdf17b7d4a61e3609ff18

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c7cb50d..b587797 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -36,5 +36,8 @@
     <permission android:name="android.permission.MAINLINE_NETWORK_STACK"
                 android:protectionLevel="signature"/>
 
-    <application android:name="com.android.server.NetworkPermissionConfig"/>
+    <!-- The application must declare usesClearTraffic because it uses the same UID as the
+         NetworkStack module, which does cleartext traffic (b/161860610). -->
+    <application android:name="com.android.server.NetworkPermissionConfig"
+                 android:usesCleartextTraffic="true"/>
 </manifest>