Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix null IpmemoryService object in AGO project." am: c28ae5a01d

Browse Source 
am: 2530911fa9

Change-Id: I8043c405b3c78d8dd1e71ec584d7a2fdaa2fd989
This commit is contained in:
Paul Hu
2019-05-24 01:36:20 -07:00
committed by android-build-merger
parent 623d1e4914 2530911fa9
commit daff547b43
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/NetworkStack/AndroidManifest.xml
View File

@@ -49,5 +49,8 @@
<action android:name="android.net.INetworkStackConnector"/> <action android:name="android.net.INetworkStackConnector"/>
</intent-filter> </intent-filter>
</service> </service>
<service android:name="com.android.server.connectivity.ipmemorystore.RegularMaintenanceJobService"
android:permission="android.permission.BIND_JOB_SERVICE" >
</service>
</application> </application>
</manifest> </manifest>

4
packages/NetworkStack/AndroidManifestBase.xml
View File

@@ -25,9 +25,5 @@
android:defaultToDeviceProtectedStorage="true" android:defaultToDeviceProtectedStorage="true"
android:directBootAware="true" android:directBootAware="true"
android:usesCleartextTraffic="true"> android:usesCleartextTraffic="true">
<service android:name="com.android.server.connectivity.ipmemorystore.RegularMaintenanceJobService"
android:permission="android.permission.BIND_JOB_SERVICE" >
</service>
</application> </application>
</manifest> </manifest>

4
packages/NetworkStack/AndroidManifest_InProcess.xml
View File

@@ -27,5 +27,9 @@
<action android:name="android.net.INetworkStackConnector.InProcess"/> <action android:name="android.net.INetworkStackConnector.InProcess"/>
</intent-filter> </intent-filter>
</service> </service>
<service android:name="com.android.server.connectivity.ipmemorystore.RegularMaintenanceJobService"
android:process="system"
android:permission="android.permission.BIND_JOB_SERVICE" >
</service>
</application> </application>
</manifest> </manifest>