omni: split privapp-permissions-omni for system_ext apps
now that we have moved all our apps to system_ext
Change-Id: Ie3a5a7e75c9404e0bd1c2f8b4db9a26e953bd499
diff --git a/config/common.mk b/config/common.mk
index ea1987a..cf5c005 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -75,8 +75,10 @@
#permissions
PRODUCT_COPY_FILES += \
- vendor/omni/prebuilt/etc/permissions/privapp-permissions-omni.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-omni.xml \
- vendor/omni/prebuilt/etc/permissions/omni-power-whitelist.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysconfig/omni-power-whitelist.xml
+ vendor/omni/prebuilt/etc/permissions/privapp-permissions-omni.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-omni.xml
+
+PRODUCT_COPY_FILES += \
+ vendor/omni/prebuilt/etc/permissions/privapp-permissions-omni-ext.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/privapp-permissions-omni-ext.xml
# custom omni sounds
PRODUCT_PRODUCT_PROPERTIES += \
diff --git a/prebuilt/etc/permissions/omni-power-whitelist.xml b/prebuilt/etc/permissions/omni-power-whitelist.xml
deleted file mode 100644
index 9d16de0..0000000
--- a/prebuilt/etc/permissions/omni-power-whitelist.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<config>
- <allow-in-power-save package="org.omnirom.deskclock" />
- <allow-in-power-save package="com.android.deskclock" />
-</config>
diff --git a/prebuilt/etc/permissions/privapp-permissions-omni-ext.xml b/prebuilt/etc/permissions/privapp-permissions-omni-ext.xml
new file mode 100644
index 0000000..2566575
--- /dev/null
+++ b/prebuilt/etc/permissions/privapp-permissions-omni-ext.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<permissions>
+ <privapp-permissions package="org.omnirom.omniswitch">
+ <permission name="android.permission.CHANGE_OVERLAY_PACKAGES"/>
+ <permission name="android.permission.FORCE_STOP_PACKAGES"/>
+ <permission name="android.permission.MANAGE_ACTIVITY_STACKS"/>
+ <permission name="android.permission.MANAGE_USERS"/>
+ <permission name="android.permission.READ_FRAME_BUFFER"/>
+ <permission name="android.permission.REAL_GET_TASKS"/>
+ <permission name="android.permission.START_TASKS_FROM_RECENTS"/>
+ <permission name="android.permission.STOP_APP_SWITCHES"/>
+ </privapp-permissions>
+
+ <privapp-permissions package="org.omnirom.control">
+ <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
+ <permission name="android.permission.CHANGE_OVERLAY_PACKAGES"/>
+ </privapp-permissions>
+
+ <privapp-permissions package="org.omnirom.omniota">
+ <permission name="android.permission.ACCESS_CACHE_FILESYSTEM"/>
+ <permission name="android.permission.REBOOT"/>
+ <permission name="android.permission.RECOVERY"/>
+ </privapp-permissions>
+</permissions>
diff --git a/prebuilt/etc/permissions/privapp-permissions-omni.xml b/prebuilt/etc/permissions/privapp-permissions-omni.xml
index d36fedc..16a6e8e 100644
--- a/prebuilt/etc/permissions/privapp-permissions-omni.xml
+++ b/prebuilt/etc/permissions/privapp-permissions-omni.xml
@@ -36,36 +36,4 @@
<permission name="android.permission.REBOOT"/>
</privapp-permissions>
- <privapp-permissions package="org.omnirom.omniswitch">
- <permission name="android.permission.CHANGE_OVERLAY_PACKAGES"/>
- <permission name="android.permission.FORCE_STOP_PACKAGES"/>
- <permission name="android.permission.MANAGE_ACTIVITY_STACKS"/>
- <permission name="android.permission.MANAGE_USERS"/>
- <permission name="android.permission.READ_FRAME_BUFFER"/>
- <permission name="android.permission.REAL_GET_TASKS"/>
- <permission name="android.permission.START_TASKS_FROM_RECENTS"/>
- <permission name="android.permission.STOP_APP_SWITCHES"/>
- </privapp-permissions>
-
- <privapp-permissions package="org.omnirom.snap">
- <permission name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
- <permission name="android.permission.WRITE_MEDIA_STORAGE"/>
- </privapp-permissions>
-
- <privapp-permissions package="com.android.customization">
- <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
- <permission name="android.permission.SET_WALLPAPER_COMPONENT"/>
- <permission name="android.permission.CHANGE_OVERLAY_PACKAGES"/>
- </privapp-permissions>
-
- <privapp-permissions package="org.omnirom.control">
- <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
- <permission name="android.permission.CHANGE_OVERLAY_PACKAGES"/>
- </privapp-permissions>
-
- <privapp-permissions package="org.omnirom.omniota">
- <permission name="android.permission.ACCESS_CACHE_FILESYSTEM"/>
- <permission name="android.permission.REBOOT"/>
- <permission name="android.permission.RECOVERY"/>
- </privapp-permissions>
</permissions>