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

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

Merge "Remove INTERACT_ACROSS_USERS_FULL for NetworkStack" 

am: 749dfc30

Change-Id: I62722875e52b1fc5486dda9a3368eb045808c1db
parents d49230d8 749dfc30

data/etc/privapp-permissions-platform.xml

+1 −8
Original line number Diff line number Diff line
@@ -202,21 +202,14 @@ applications that come with the platform 


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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

packages/NetworkStack/AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ 
    <uses-permission android:name="android.permission.NETWORK_SETTINGS" />

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

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

    <!-- Launch captive portal app as specific user -->

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

    <!-- Send latency broadcast as current user -->

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

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

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

    <application