summaryrefslogtreecommitdiff
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2020-09-14 03:04:33 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2020-09-14 03:04:33 +0000
commit46dc3a25e05d9942b7aee6a93274b44a9d306267 (patch)
treeaf233de022dd72d5af4b23d97301399d8dad76bd /AndroidManifest.xml
parentae0e3f4b626252b44a934a2f675b5f5b213fcca2 (diff)
parent0af7a8adda49f72a9c9d9eb90796e265b2303d80 (diff)
downloadNetworkPermissionConfig-46dc3a25e05d9942b7aee6a93274b44a9d306267.tar.gz
Merge "usesCleartextTraffic in NetworkPermissionConfig"
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml5
1 files changed, 4 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4b5ac58..ff94f59 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>