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

Commit 779406cd authored by Andrei-Valentin Onea's avatar Andrei-Valentin Onea Committed by Automerger Merge Worker
Browse files

Merge "Revert^2 "Move out allowlists for com.android.cellbroadcast"" into tm-dev am: 61189993 

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

Change-Id: I477b15c78fbecaa5a1c3f82ea1a66f4c7facc369
parents 75117954 61189993

data/etc/Android.bp

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

deleted100644 → 0
+0 −29
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

+0 −18
Original line number Diff line number Diff line
@@ -38,24 +38,6 @@ 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"/>