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

Commit 9dbd2093 authored by Anton Hansson's avatar Anton Hansson Committed by Gerrit Code Review
Browse files

Merge "Separate privapp grant for settings.intelligence"

parents 8865471c 099d53b9

data/etc/Android.bp

+10 −0
Original line number Diff line number Diff line
@@ -39,6 +39,9 @@ prebuilt_etc { 
    name: "privapp-permissions-platform.xml",

    sub_dir: "permissions",

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

    required: [

        "privapp_whitelist_com.android.settings.intelligence",

    ]

}



prebuilt_etc {
@@ -49,6 +52,13 @@ prebuilt_etc { 
    filename_from_src: true,

}



prebuilt_etc {

    name: "privapp_whitelist_com.android.settings.intelligence",

    sub_dir: "permissions",

    src: "com.android.settings.intelligence.xml",

    filename_from_src: true,

}



prebuilt_etc {

    name: "privapp_whitelist_com.android.systemui",

    product_specific: true,

data/etc/com.android.settings.intelligence.xml

0 → 100644
+23 −0
Original line number 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.settings.intelligence">

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

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

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

    </privapp-permissions>

</permissions>

data/etc/privapp-permissions-platform.xml

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

    </privapp-permissions>



    <privapp-permissions package="com.android.settings.intelligence">

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

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

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

    </privapp-permissions>



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

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

    </privapp-permissions>