diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2019-05-17 02:29:16 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-05-17 02:29:16 +0000 |
| commit | 0a51e93a9b9493d23e18426bd0e31f15d15fb8a6 (patch) | |
| tree | a51da464ea0a47b24d6e699b446e59d802330f4f /packages/NetworkStack | |
| parent | 51374fc706c8d83f481a498bb582dea4be388058 (diff) | |
| parent | a95544d9a8dcad6aaada7f1a0bcd97452a375828 (diff) | |
Merge "Do not mark in-process NetworkStack as persistent" into qt-dev
Diffstat (limited to 'packages/NetworkStack')
| -rw-r--r-- | packages/NetworkStack/AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | packages/NetworkStack/AndroidManifestBase.xml | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/packages/NetworkStack/AndroidManifest.xml b/packages/NetworkStack/AndroidManifest.xml index bfcd6c1baba3..4c4448482e03 100644 --- a/packages/NetworkStack/AndroidManifest.xml +++ b/packages/NetworkStack/AndroidManifest.xml @@ -41,7 +41,9 @@ <uses-permission android:name="android.permission.READ_DEVICE_CONFIG" /> <!-- Signature permission defined in NetworkStackStub --> <uses-permission android:name="android.permission.MAINLINE_NETWORK_STACK" /> - <application android:extractNativeLibs="false"> + <application + android:extractNativeLibs="false" + android:persistent="true"> <service android:name="com.android.server.NetworkStackService"> <intent-filter> <action android:name="android.net.INetworkStackConnector"/> diff --git a/packages/NetworkStack/AndroidManifestBase.xml b/packages/NetworkStack/AndroidManifestBase.xml index 3da566f88659..d00a55143605 100644 --- a/packages/NetworkStack/AndroidManifestBase.xml +++ b/packages/NetworkStack/AndroidManifestBase.xml @@ -24,7 +24,6 @@ android:label="NetworkStack" android:defaultToDeviceProtectedStorage="true" android:directBootAware="true" - android:persistent="true" android:usesCleartextTraffic="true"> <service android:name="com.android.server.connectivity.ipmemorystore.RegularMaintenanceJobService" |