diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2019-05-16 18:02:11 +0900 |
|---|---|---|
| committer | Remi NGUYEN VAN <reminv@google.com> | 2019-05-16 18:21:54 +0900 |
| commit | a95544d9a8dcad6aaada7f1a0bcd97452a375828 (patch) | |
| tree | ec6a29747e5ff246c23056545384ba1523f01f90 | |
| parent | fc4a83bd4b6d3ac573e777d45960f5f2949a6289 (diff) | |
Do not mark in-process NetworkStack as persistent
The in-process NetworkStack runs in the system process, so it does not
need to be marked persistent.
Doing so causes a spurious com.android.networkstack.inprocess process to
be running, wasting memory.
Bug: 131046856
Test: Flashed sailfish, networking works, no extra process started
Test: Flashed walleye, networking still works
Test: aapt dump xmltree NetworkStack.apk AndroidManifest.xml unchanged
Change-Id: I0eb896c825ffe2581950c0bdd2b31ebd7eae0982
| -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" |