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

Commit 8f5e78c0 authored by Andrei Onea's avatar Andrei Onea
Browse files

Move out allowlists for com.android.cellbroadcast 

This change separates out the allowlist for the
com.android.cellbroadcast mainline module. This apex bundles two apks
(CellBroadcastApp and CellBroadcastServiceModule) that have regular
apk counterparts for non-mainline devices.
The allowlists are now in the projects which contain the source code for
the respective APKs, and are marked as dependencies for them

Test: boots
Bug: 190375768
Change-Id: I98c7c5a0ffb9b16dd859cb586d3afae082981d7c
parent 854cd54a

data/etc/Android.bp

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

    filename_from_src: true,

}

}





prebuilt_etc {

    name: "privapp_whitelist_com.android.cellbroadcastreceiver",

    system_ext_specific: true,

    sub_dir: "permissions",

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

    filename_from_src: true,

}



prebuilt_etc {

prebuilt_etc {

    name: "privapp_whitelist_com.android.contacts",

    name: "privapp_whitelist_com.android.contacts",

    product_specific: true,

    product_specific: true,

data/etc/com.android.cellbroadcastreceiver.xml

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

<!--

  ~ Copyright (C) 2020 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.cellbroadcastreceiver">

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

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

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

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

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

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

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

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

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

    </privapp-permissions>

</permissions>

data/etc/privapp-permissions-platform.xml

+0 −18
Original line number Original line Diff line number Diff line
@@ -45,24 +45,6 @@ applications that come with the platform 
        <permission name="android.permission.CRYPT_KEEPER"/>

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

    </privapp-permissions>

    </privapp-permissions>





    <privapp-permissions package="com.android.cellbroadcastreceiver.module">

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

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

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

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

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

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

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

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

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

    </privapp-permissions>



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

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

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

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

    </privapp-permissions>



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

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

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

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

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

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