diff options
| author | 2019-05-27 11:04:15 +0000 | |
|---|---|---|
| committer | 2019-05-27 11:04:15 +0000 | |
| commit | ece7a57af5093d722db319e694bedd12cdb74356 (patch) | |
| tree | 61158132669b3ddc08fbf21aeccece62e01add87 | |
| parent | e02360b53a3fc5c9ddfdbe5819e3f88a1244f051 (diff) | |
| parent | 8e2743045d3f4238fbd31af604afc90360ea78cb (diff) | |
Merge "Fix null IpmemoryService object in AGO project." into qt-dev
| -rw-r--r-- | packages/NetworkStack/AndroidManifest.xml | 3 | ||||
| -rw-r--r-- | packages/NetworkStack/AndroidManifestBase.xml | 4 | ||||
| -rw-r--r-- | packages/NetworkStack/AndroidManifest_InProcess.xml | 4 |
3 files changed, 7 insertions, 4 deletions
diff --git a/packages/NetworkStack/AndroidManifest.xml b/packages/NetworkStack/AndroidManifest.xml index 4c4448482e03..6166c66e0f42 100644 --- a/packages/NetworkStack/AndroidManifest.xml +++ b/packages/NetworkStack/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/packages/NetworkStack/AndroidManifestBase.xml b/packages/NetworkStack/AndroidManifestBase.xml index d00a55143605..69a4da46e088 100644 --- a/packages/NetworkStack/AndroidManifestBase.xml +++ b/packages/NetworkStack/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/packages/NetworkStack/AndroidManifest_InProcess.xml b/packages/NetworkStack/AndroidManifest_InProcess.xml index 275cd02a6cc0..2778a2a5900b 100644 --- a/packages/NetworkStack/AndroidManifest_InProcess.xml +++ b/packages/NetworkStack/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> |