commit | 9009b91df6ad7fb1b9601e341d90ffdb298bba22 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Sep 14 05:10:36 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 14 05:10:36 2020 +0000 |
tree | af233de022dd72d5af4b23d97301399d8dad76bd | |
parent | 9ec0e3057c1234a8eecb3d8d1c4ad599cc88125e [diff] | |
parent | c1e6d9f82b81380a6ba6c259325e6f24d95afbe0 [diff] |
Merge "usesCleartextTraffic in NetworkPermissionConfig" am: 46dc3a25e0 am: 21e6f25ab0 am: f30857ae42 am: c1e6d9f82b Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/1420011 Change-Id: I49468ccb24f08d6ff7f47ebf70c82a6ebfa823f0
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>