Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2530911f authored by Paul Hu's avatar Paul Hu Committed by android-build-merger
Browse files

Merge "Fix null IpmemoryService object in AGO project." 

am: c28ae5a0

Change-Id: I33d705a911c08d9a14b54672cd3477d3ad07a211
parents 105c27e4 c28ae5a0

packages/NetworkStack/AndroidManifest.xml

+3 −0
Original line number Diff line number Diff line
@@ -45,5 +45,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>

packages/NetworkStack/AndroidManifestBase.xml

+0 −4
Original line number Diff line number Diff line
@@ -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>

packages/NetworkStack/AndroidManifest_InProcess.xml

+4 −0
Original line number Diff line number Diff line
@@ -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>