diff options
| -rw-r--r-- | data/etc/Android.bp | 10 | ||||
| -rw-r--r-- | data/etc/com.android.settings.intelligence.xml | 23 | ||||
| -rw-r--r-- | data/etc/privapp-permissions-platform.xml | 6 |
3 files changed, 33 insertions, 6 deletions
diff --git a/data/etc/Android.bp b/data/etc/Android.bp index 25dabad6d34c..0bffa387489b 100644 --- a/data/etc/Android.bp +++ b/data/etc/Android.bp @@ -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 { @@ -50,6 +53,13 @@ prebuilt_etc { } 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, sub_dir: "permissions", diff --git a/data/etc/com.android.settings.intelligence.xml b/data/etc/com.android.settings.intelligence.xml new file mode 100644 index 000000000000..f06ae86eb55c --- /dev/null +++ b/data/etc/com.android.settings.intelligence.xml @@ -0,0 +1,23 @@ +<?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> diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml index 07287b1e5eba..a1a4f48fac6e 100644 --- a/data/etc/privapp-permissions-platform.xml +++ b/data/etc/privapp-permissions-platform.xml @@ -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> |