commit c31e3686fb3270d270047e6c82733c5ef0004f08
author Bill Yi <byi@google.com> Mon Sep 14 05:33:53 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 14 05:33:53 2020 +0000
tree 004f9a297e2138ac3b087e0e1a799d996837a741
parent 21e6f25ab0f0ef075afc11d34efa59c2a2396546
parent 3df8f22364a65e5d3540d392dacf05281a508347

Merge "Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index fe11c9a..cb7f2e3 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>