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

Commit ece7a57a authored by Paul Hu's avatar Paul Hu Committed by Android (Google) Code Review
Browse files

Merge "Fix null IpmemoryService object in AGO project." into qt-dev

parents e02360b5 8e274304

packages/NetworkStack/AndroidManifest.xml

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

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>