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

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

Merge "Move EmergencyInfo perm whitelist to /product" am: ae957afa 

am: 300026a5

Change-Id: Ia932307a9b85366daa8e8ec09dd92a124ea1d8cf
parents f066e6b7 300026a5

data/etc/Android.bp

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

    filename_from_src: true,

}

}





prebuilt_etc {

    name: "privapp_whitelist_com.android.emergency",

    product_specific: true,

    sub_dir: "permissions",

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

    filename_from_src: true,

}



prebuilt_etc {

prebuilt_etc {

    name: "privapp_whitelist_com.android.launcher3",

    name: "privapp_whitelist_com.android.launcher3",

    product_specific: true,

    product_specific: true,

data/etc/com.android.emergency.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.emergency">

        <!-- Required to place emergency calls from emergency info screen. -->

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

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

    </privapp-permissions>

</permissions>

data/etc/privapp-permissions-platform.xml

+0 −6
Original line number Original line Diff line number Diff line
@@ -48,12 +48,6 @@ applications that come with the platform 
        <permission name="android.permission.WRITE_MEDIA_STORAGE"/>

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

    </privapp-permissions>

    </privapp-permissions>





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

        <!-- Required to place emergency calls from emergency info screen. -->

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

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

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