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

Commit 0deb7bee authored by Shreshta Manu's avatar Shreshta Manu
Browse files

Revert "Move out allowlists for com.android.cellbroadcast" 

Revert "Add allowlist for com.android.cellbroadcast"

Revert "Add dependencies to the proper allowlists"

Revert submission 17044809-cb-allowlist

Reason for revert:  DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_tm-dev&target=build_test3&lkgb=8255403&lkbb=8255504&fkbb=8255504, bug b/222699462 

Broken build 8255504 on git_tm-dev on build_test3

BUG: 222699462
Reverted Changes:
Ib067db22c:Add dependencies to the proper allowlists
I98c7c5a0f:Move out allowlists for com.android.cellbroadcast
I7c09f43c3:Add allowlist for com.android.cellbroadcast

Change-Id: Ibce1f97cf8678c8397f3b7cde7d06c1471cf35e4
parent 8f5e78c0

data/etc/Android.bp

+8 −0
Original line number Diff line number Diff line
@@ -70,6 +70,14 @@ prebuilt_etc { 
    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 {

    name: "privapp_whitelist_com.android.contacts",

    product_specific: true,

data/etc/com.android.cellbroadcastreceiver.xml

0 → 100644
+29 −0
Original line number 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

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

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

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

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