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

Commit 76fb31cd authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by android-build-merger
Browse files

Merge "Do not mark in-process NetworkStack as persistent" into qt-dev am: 0a51e93a9b am: 7055e64685 

am: 9ee4e6258f

Change-Id: I779e1922c1cf335fc0762632872a1982f1225bf0
parents c3ba7fa0 ec32c16a

AndroidManifest.xml

+3 −1
Original line number Diff line number Diff line
@@ -41,7 +41,9 @@ 
    <uses-permission android:name="android.permission.READ_DEVICE_CONFIG" />

    <!-- Signature permission defined in NetworkStackStub -->

    <uses-permission android:name="android.permission.MAINLINE_NETWORK_STACK" />

    <application android:extractNativeLibs="false">

    <application

        android:extractNativeLibs="false"

        android:persistent="true">

        <service android:name="com.android.server.NetworkStackService">

            <intent-filter>

                <action android:name="android.net.INetworkStackConnector"/>

AndroidManifestBase.xml

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
        android:label="NetworkStack"

        android:defaultToDeviceProtectedStorage="true"

        android:directBootAware="true"

        android:persistent="true"

        android:usesCleartextTraffic="true">



        <service android:name="com.android.server.connectivity.ipmemorystore.RegularMaintenanceJobService"