commit 28e4034be612d962a00e2b1b18d9d37e3a7944f0
author Jack <jackeagle102@gmail.com> Mon May 04 12:05:48 2020 +0530
committer Gerrit Code Review <gerrit2@blissroms.com> Mon May 04 12:05:48 2020 +0530
tree f987ad469e6eb259eb204ac63dcc7958eba47a61
parent 56511c2c6309e288c09252ca2fbb128747b68d8e
parent 2997445f7bedd87b5c48c6b0505a248e64a34725

Merge "vendor: Allow providing camera server and service" into q10

config/permissions/privapp-permissions-cm-legacy.xml

diff --git a/config/permissions/privapp-permissions-cm-legacy.xml b/config/permissions/privapp-permissions-cm-legacy.xml
index 928bf0c..803b95f 100644
--- a/config/permissions/privapp-permissions-cm-legacy.xml
+++ b/config/permissions/privapp-permissions-cm-legacy.xml
@@ -25,9 +25,9 @@
 
     <privapp-permissions package="org.cyanogenmod.snap">
         <permission name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
-        <permission name="android.permission.PREVENT_POWER_KEY"/>
         <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
         <permission name="android.permission.WRITE_MEDIA_STORAGE"/>
+        <permission name="lineage.permission.PREVENT_POWER_KEY"/>
     </privapp-permissions>
 
 </permissions>

config/permissions/privapp-permissions-lineage-product.xml

diff --git a/config/permissions/privapp-permissions-lineage-product.xml b/config/permissions/privapp-permissions-lineage-product.xml
index 11234fe..28b063d 100644
--- a/config/permissions/privapp-permissions-lineage-product.xml
+++ b/config/permissions/privapp-permissions-lineage-product.xml
@@ -17,7 +17,7 @@
 
     <privapp-permissions package="com.android.camera2">
         <permission name="android.permission.BIND_WALLPAPER"/>
-        <permission name="android.permission.PREVENT_POWER_KEY"/>
+        <permission name="lineage.permission.PREVENT_POWER_KEY"/>
     </privapp-permissions>
 
     <!-- Additional permissions on top of privapp-permissions-platform.xml -->

config/permissions/privapp-permissions-lineage-system.xml

diff --git a/config/permissions/privapp-permissions-lineage-system.xml b/config/permissions/privapp-permissions-lineage-system.xml
index 200fce8..4f94c52 100644
--- a/config/permissions/privapp-permissions-lineage-system.xml
+++ b/config/permissions/privapp-permissions-lineage-system.xml
@@ -70,9 +70,9 @@
 
     <privapp-permissions package="org.lineageos.snap">
         <permission name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
-        <permission name="android.permission.PREVENT_POWER_KEY"/>
         <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
         <permission name="android.permission.WRITE_MEDIA_STORAGE"/>
+        <permission name="lineage.permission.PREVENT_POWER_KEY"/>
     </privapp-permissions>
 
     <privapp-permissions package="org.lineageos.updater">