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

Commit 6b48f40c authored by Paul Hu's avatar Paul Hu Committed by android-build-merger
Browse files

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

am: ece7a57a

Change-Id: I7b933cd95e4e3173256baadb2911a8e66fc8ad22
parents 805c23ac ece7a57a

packages/NetworkStack/AndroidManifest.xml

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

packages/NetworkStack/AndroidManifestBase.xml

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

packages/NetworkStack/AndroidManifest_InProcess.xml

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