diff options
| author | Paul Hu <paulhu@google.com> | 2019-05-24 18:28:23 -0700 |
|---|---|---|
| committer | Paul Hu <paulhu@google.com> | 2019-05-27 01:22:15 +0000 |
| commit | ac95b9f11a6576b09114f6585df2d01a7722f7f7 (patch) | |
| tree | 385a23cefbd6233396deee95baaa710ee708fa74 | |
| parent | ae343fc3a7cda11c763c2a8f007a1495a462dd42 (diff) | |
Fix null IpmemoryService object in AGO project.
WTF will happen in RegularMaintenanceJobService due to
scheduling job and starting maintenance job are in different
processes. In AGO project, scheduling job use inprocess process.
But starting maintenance job use networkstack process. So
IpmemoryService objcet will be null when trying to do the
maintenance job.
Bug: 132763800
Test: Verify on both AGO and non-AGO projects that WFT will not
happen.
Test: atest NetworkStackTests
Change-Id: I545fc8384ef7b3d97edf2270fa033d8afac2669c
Merged-In: If7f61a8b5ddc8cdd25928cd35afa7fece2c8dde5
Merged-In: I8043c405b3c78d8dd1e71ec584d7a2fdaa2fd989
Merged-In: I545fc8384ef7b3d97edf2270fa033d8afac2669c
(cherry picked from commit 20abd7d4e6c63b225de2e87595e5f2758353f894)
| -rw-r--r-- | AndroidManifest.xml | 3 | ||||
| -rw-r--r-- | AndroidManifestBase.xml | 4 | ||||
| -rw-r--r-- | AndroidManifest_InProcess.xml | 4 |
3 files changed, 7 insertions, 4 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 4c44484..6166c66 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -49,5 +49,8 @@ <action android:name="android.net.INetworkStackConnector"/> </intent-filter> </service> + <service android:name="com.android.server.connectivity.ipmemorystore.RegularMaintenanceJobService" + android:permission="android.permission.BIND_JOB_SERVICE" > + </service> </application> </manifest> diff --git a/AndroidManifestBase.xml b/AndroidManifestBase.xml index d00a551..69a4da4 100644 --- a/AndroidManifestBase.xml +++ b/AndroidManifestBase.xml @@ -25,9 +25,5 @@ android:defaultToDeviceProtectedStorage="true" android:directBootAware="true" android:usesCleartextTraffic="true"> - - <service android:name="com.android.server.connectivity.ipmemorystore.RegularMaintenanceJobService" - android:permission="android.permission.BIND_JOB_SERVICE" > - </service> </application> </manifest> diff --git a/AndroidManifest_InProcess.xml b/AndroidManifest_InProcess.xml index 275cd02..2778a2a 100644 --- a/AndroidManifest_InProcess.xml +++ b/AndroidManifest_InProcess.xml @@ -27,5 +27,9 @@ <action android:name="android.net.INetworkStackConnector.InProcess"/> </intent-filter> </service> + <service android:name="com.android.server.connectivity.ipmemorystore.RegularMaintenanceJobService" + android:process="system" + android:permission="android.permission.BIND_JOB_SERVICE" > + </service> </application> </manifest> |