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 | 5f8be2441f1b9fb4ed08f68f6ab61c1276a5a079 (patch) | |
| tree | ac75d56db0e289d795eaacc0ff79aab044549d23 | |
| parent | faa5f9053c146062f94875bddfc743de4aba77df (diff) | |
| parent | 860ea3cc6a3bc4efa248fb641ebc5538a17400f5 (diff) | |
Merge "Do not mark in-process NetworkStack as persistent" into qt-dev
| -rw-r--r-- | AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | AndroidManifestBase.xml | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index bfcd6c1..4c44484 100644 --- a/AndroidManifest.xml +++ b/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/AndroidManifestBase.xml b/AndroidManifestBase.xml index 3da566f..d00a551 100644 --- a/AndroidManifestBase.xml +++ b/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" |