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

Commit 2ed60973 authored by Aaron Huang's avatar Aaron Huang Committed by Automerger Merge Worker
Browse files

Merge "Split out NetworkStack and Tethering permission" am: ec33ff5b 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1688286

Change-Id: I2541ba0998c08667349116491a7fc86c27df6e05
parents 8224136f ec33ff5b

data/etc/Android.bp

+14 −0
Original line number Diff line number Diff line
@@ -118,6 +118,20 @@ prebuilt_etc { 
    filename_from_src: true,

}



prebuilt_etc {

    name: "privapp_whitelist_com.android.networkstack",

    sub_dir: "permissions",

    src: "com.android.networkstack.xml",

    filename_from_src: true,

}



prebuilt_etc {

    name: "privapp_whitelist_com.android.networkstack.tethering",

    sub_dir: "permissions",

    src: "com.android.networkstack.tethering.xml",

    filename_from_src: true,

}



prebuilt_etc {

    name: "privapp_whitelist_com.android.provision",

    system_ext_specific: true,

data/etc/com.android.networkstack.tethering.xml

0 → 100644
+28 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2021 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

-->



<permissions>

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

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

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

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

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

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

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

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

      </privapp-permissions>

</permissions>

data/etc/com.android.networkstack.xml

0 → 100644
+38 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2021 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

-->



<permissions>

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

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

        <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_SUBSCRIPTION_PLANS"/>

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

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

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

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

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

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

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

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

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

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

    </privapp-permissions>

</permissions>

data/etc/privapp-permissions-platform.xml

+0 −30
Original line number Diff line number Diff line
@@ -254,36 +254,6 @@ applications that come with the platform 
        <permission name="android.permission.READ_COMPAT_CHANGE_CONFIG" />

    </privapp-permissions>



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

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

        <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_SUBSCRIPTION_PLANS"/>

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

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

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

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

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

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

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

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

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

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

    </privapp-permissions>



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

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

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

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

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

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

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

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

    </privapp-permissions>



    <privapp-permissions package="com.android.server.telecom">

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

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