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

Commit d231ab27 authored by Anton Hansson's avatar Anton Hansson Committed by android-build-merger
Browse files

Merge "Split out more privapp permissions" am: 7e620669 am: 530a86ef 

am: 2dd31acf

Change-Id: I5a18b51e5f66f9782e77dbee7b57716bb9b48b14
parents 0c4000d1 2dd31acf

data/etc/Android.bp

+41 −1
Original line number Original line Diff line number Diff line
@@ -40,8 +40,41 @@ prebuilt_etc { 
    sub_dir: "permissions",

    sub_dir: "permissions",

    src: "privapp-permissions-platform.xml",

    src: "privapp-permissions-platform.xml",

    required: [

    required: [

        "privapp_whitelist_com.android.carrierconfig",

        "privapp_whitelist_com.android.contacts",

        "privapp_whitelist_com.android.launcher3",

        "privapp_whitelist_com.android.provision",

        "privapp_whitelist_com.android.settings.intelligence",

        "privapp_whitelist_com.android.settings.intelligence",

    ]

        "privapp_whitelist_com.android.storagemanager",

    ],

}



prebuilt_etc {

    name: "privapp_whitelist_com.android.carrierconfig",

    sub_dir: "permissions",

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

    filename_from_src: true,

}



prebuilt_etc {

    name: "privapp_whitelist_com.android.contacts",

    sub_dir: "permissions",

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

    filename_from_src: true,

}



prebuilt_etc {

    name: "privapp_whitelist_com.android.launcher3",

    sub_dir: "permissions",

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

    filename_from_src: true,

}



prebuilt_etc {

    name: "privapp_whitelist_com.android.provision",

    sub_dir: "permissions",

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

    filename_from_src: true,

}

}





prebuilt_etc {

prebuilt_etc {
@@ -59,6 +92,13 @@ prebuilt_etc { 
    filename_from_src: true,

    filename_from_src: true,

}

}





prebuilt_etc {

    name: "privapp_whitelist_com.android.storagemanager",

    sub_dir: "permissions",

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

    filename_from_src: true,

}



prebuilt_etc {

prebuilt_etc {

    name: "privapp_whitelist_com.android.systemui",

    name: "privapp_whitelist_com.android.systemui",

    product_specific: true,

    product_specific: true,

data/etc/com.android.carrierconfig.xml

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

<!--

  ~ Copyright (C) 2019 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.carrierconfig">

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

    </privapp-permissions>

</permissions>

data/etc/com.android.contacts.xml

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

<!--

  ~ Copyright (C) 2019 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.contacts">

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

        <permission name="com.android.voicemail.permission.READ_VOICEMAIL"/>

    </privapp-permissions>

</permissions>

data/etc/com.android.launcher3.xml

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

<!--

  ~ Copyright (C) 2019 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.launcher3">

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

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

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

    </privapp-permissions>

</permissions>

data/etc/com.android.provision.xml

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

<!--

  ~ Copyright (C) 2019 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.provision">

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

    </privapp-permissions>

</permissions>