diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-14 03:38:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-14 03:38:36 +0000 |
| commit | 21e6f25ab0f0ef075afc11d34efa59c2a2396546 (patch) | |
| tree | af233de022dd72d5af4b23d97301399d8dad76bd | |
| parent | 25b499e59f80b48a4dcc664665ab585990445e1c (diff) | |
| parent | 46dc3a25e05d9942b7aee6a93274b44a9d306267 (diff) | |
| download | NetworkPermissionConfig-21e6f25ab0f0ef075afc11d34efa59c2a2396546.tar.gz | |
Merge "usesCleartextTraffic in NetworkPermissionConfig" am: 46dc3a25e0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkPermissionConfig/+/1420011
Change-Id: Id6eb8d6a6933f90ab2b7ef8eda4e61ee64fed455
| -rw-r--r-- | AndroidManifest.xml | 5 |
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> |