diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2020-10-01 20:26:57 +0000 |
|---|---|---|
| committer | android-build-prod (mdb) <android-build-team-robot@google.com> | 2020-10-01 20:26:57 +0000 |
| commit | 675cd8335d5764a2787847124ee7d00cc61e8faa (patch) | |
| tree | 004f9a297e2138ac3b087e0e1a799d996837a741 | |
| parent | e08424f7e335ad50aad17149d401bbdbe5196e12 (diff) | |
| parent | 3019727fb1f4908fdb5977e2f652b8e895e02605 (diff) | |
| download | platform_packages_modules_NetworkPermissionConfig-sdk-release.tar.gz platform_packages_modules_NetworkPermissionConfig-sdk-release.tar.bz2 platform_packages_modules_NetworkPermissionConfig-sdk-release.zip | |
Snap for 6877830 from 3019727fb1f4908fdb5977e2f652b8e895e02605 to sdk-releasesdk-release
Change-Id: I8ea7a35ee6300dd3e17978063f942c6fc4850917
| -rw-r--r-- | AndroidManifest.xml | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index c7cb50d..cb7f2e3 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -19,9 +19,9 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.networkstack.permissionconfig" android:sharedUserId="android.uid.networkstack" - android:versionCode="299900000" - android:versionName="2019-09" -> + android:versionCode="300900700" + android:versionName="r_aml_300900700" + > <!-- This package only exists to define the below permissions, and enforce that they are only granted to apps sharing the same signature. @@ -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> |