From b838db5dec95071e37fbf8722b15d49f60c4c603 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Wed, 6 May 2020 15:57:40 +0300 Subject: [PATCH] config: Move permission xml to apps Move required permissions to the respective apps. This allows people to use a lot of our apps outside lineage without extra changes. Change-Id: I840a9edeae38e94ff6592c4817fcea6f5e4a7e8f --- config/common.mk | 13 +-- .../lineage-default-permissions.xml | 38 --------- .../permissions/lineage-power-whitelist.xml | 20 ----- .../privapp-permissions-cm-legacy.xml | 33 -------- .../privapp-permissions-lineage-product.xml | 38 --------- .../privapp-permissions-lineage-system.xml | 79 ------------------- 6 files changed, 1 insertion(+), 220 deletions(-) delete mode 100644 config/permissions/lineage-default-permissions.xml delete mode 100644 config/permissions/lineage-power-whitelist.xml delete mode 100644 config/permissions/privapp-permissions-cm-legacy.xml delete mode 100644 config/permissions/privapp-permissions-lineage-product.xml delete mode 100644 config/permissions/privapp-permissions-lineage-system.xml diff --git a/config/common.mk b/config/common.mk index dae7d9cf..2fe9cb01 100644 --- a/config/common.mk +++ b/config/common.mk @@ -68,23 +68,12 @@ PRODUCT_COPY_FILES += \ # This is Lineage! PRODUCT_COPY_FILES += \ - vendor/lineage/config/permissions/org.lineageos.android.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/org.lineageos.android.xml \ - vendor/lineage/config/permissions/privapp-permissions-lineage-system.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-lineage.xml \ - vendor/lineage/config/permissions/privapp-permissions-lineage-product.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/privapp-permissions-lineage.xml \ - vendor/lineage/config/permissions/privapp-permissions-cm-legacy.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-cm-legacy.xml + vendor/lineage/config/permissions/org.lineageos.android.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/org.lineageos.android.xml # Enforce privapp-permissions whitelist PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ ro.control_privapp_permissions=enforce -# Power whitelist -PRODUCT_COPY_FILES += \ - vendor/lineage/config/permissions/lineage-power-whitelist.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysconfig/lineage-power-whitelist.xml - -# Pre-granted permissions -PRODUCT_COPY_FILES += \ - vendor/lineage/config/permissions/lineage-default-permissions.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/default-permissions/lineage-default-permissions.xml - # Include AOSP audio files include vendor/lineage/config/aosp_audio.mk diff --git a/config/permissions/lineage-default-permissions.xml b/config/permissions/lineage-default-permissions.xml deleted file mode 100644 index 464ff478..00000000 --- a/config/permissions/lineage-default-permissions.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - diff --git a/config/permissions/lineage-power-whitelist.xml b/config/permissions/lineage-power-whitelist.xml deleted file mode 100644 index b6545ba0..00000000 --- a/config/permissions/lineage-power-whitelist.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - diff --git a/config/permissions/privapp-permissions-cm-legacy.xml b/config/permissions/privapp-permissions-cm-legacy.xml deleted file mode 100644 index 803b95fc..00000000 --- a/config/permissions/privapp-permissions-cm-legacy.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/config/permissions/privapp-permissions-lineage-product.xml b/config/permissions/privapp-permissions-lineage-product.xml deleted file mode 100644 index aeb4ce6d..00000000 --- a/config/permissions/privapp-permissions-lineage-product.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/config/permissions/privapp-permissions-lineage-system.xml b/config/permissions/privapp-permissions-lineage-system.xml deleted file mode 100644 index f8206fd4..00000000 --- a/config/permissions/privapp-permissions-lineage-system.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -