diff options
| author | Scott Lobdell <slobdell@google.com> | 2019-05-10 09:55:53 -0700 |
|---|---|---|
| committer | Scott Lobdell <slobdell@google.com> | 2019-05-17 12:03:52 -0700 |
| commit | 1eef3e1566be8570a0f7a856f12f8992f7d34824 (patch) | |
| tree | bf28c9d7d135ee48fdee3a28d7267e309dbf7f09 /packages/NetworkStack | |
| parent | f9f9f03acdeb05e6978feca02f6ef20ff57d06bc (diff) | |
| parent | 02351afb75b6543f91d9f0b0cdfe4527ea10b0a5 (diff) | |
Merge QP1A.190509.001
Change-Id: I97bb3901e50d34a7fbe3c85480379d173ef5c0be
Diffstat (limited to 'packages/NetworkStack')
| -rw-r--r-- | packages/NetworkStack/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | packages/NetworkStack/AndroidManifestBase.xml | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/packages/NetworkStack/AndroidManifest.xml b/packages/NetworkStack/AndroidManifest.xml index ac05c44c1803..252b90fea840 100644 --- a/packages/NetworkStack/AndroidManifest.xml +++ b/packages/NetworkStack/AndroidManifest.xml @@ -19,7 +19,7 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.networkstack" android:sharedUserId="android.uid.networkstack" - android:versionCode="210000000" + android:versionCode="220000000" android:versionName="29 system image" > diff --git a/packages/NetworkStack/AndroidManifestBase.xml b/packages/NetworkStack/AndroidManifestBase.xml index d00a55143605..3da566f88659 100644 --- a/packages/NetworkStack/AndroidManifestBase.xml +++ b/packages/NetworkStack/AndroidManifestBase.xml @@ -24,6 +24,7 @@ android:label="NetworkStack" android:defaultToDeviceProtectedStorage="true" android:directBootAware="true" + android:persistent="true" android:usesCleartextTraffic="true"> <service android:name="com.android.server.connectivity.ipmemorystore.RegularMaintenanceJobService" |