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

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

Merge "Rename NetworkStack package" am: e4a40c77 am: 69728afb 

am: 8f46e050

Change-Id: I9d5b907c3bcd9b15899307927b8518a9f60eceba
parents 1dc37e96 8f46e050

data/etc/privapp-permissions-platform.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -207,7 +207,7 @@ applications that come with the platform 
        <permission name="android.permission.USE_RESERVED_DISK"/>

        <permission name="android.permission.USE_RESERVED_DISK"/>

    </privapp-permissions>

    </privapp-permissions>





    <privapp-permissions package="com.android.mainline.networkstack">

    <privapp-permissions package="com.android.networkstack">

        <permission name="android.permission.ACCESS_NETWORK_CONDITIONS"/>

        <permission name="android.permission.ACCESS_NETWORK_CONDITIONS"/>

        <permission name="android.permission.CONNECTIVITY_INTERNAL"/>

        <permission name="android.permission.CONNECTIVITY_INTERNAL"/>

        <permission name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"/>

        <permission name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"/>

packages/NetworkStack/AndroidManifest.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -17,7 +17,7 @@ 
 */

 */

-->

-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

          package="com.android.mainline.networkstack"

          package="com.android.networkstack"

          android:sharedUserId="android.uid.networkstack">

          android:sharedUserId="android.uid.networkstack">

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

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

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

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

packages/NetworkStackPermissionStub/AndroidManifest.xml

+2 −1
Original line number Original line Diff line number Diff line
@@ -17,7 +17,8 @@ 
 */

 */

-->

-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.android.mainline.networkstack.permissionstub">

    package="com.android.networkstack.permissionstub"

    android:sharedUserId="android.uid.networkstack">

    <!--

    <!--

    This package only exists to define the below permissions, and enforce that they are only

    This package only exists to define the below permissions, and enforce that they are only

    granted to apps sharing the same signature.

    granted to apps sharing the same signature.