From 3c1fe1160f6ffbfdf27285f8876d2c7c0b5ddc3b Mon Sep 17 00:00:00 2001
From: Michael Bestas <mkbestas@lineageos.org>
Date: Sat, 12 Oct 2019 18:48:58 +0300
Subject: [PATCH] sdm660-common: Split privapp permissions for
 ims/qcrilmsgtunnel move

Change-Id: I5e86a415c7faac34e7d398559d09bf350b305cc3
---
 configs/privapp-permissions-qti-product.xml   | 40 +++++++++++++++++++
 ...xml => privapp-permissions-qti-system.xml} | 10 -----
 sdm660.mk                                     |  3 +-
 3 files changed, 42 insertions(+), 11 deletions(-)
 create mode 100644 configs/privapp-permissions-qti-product.xml
 rename configs/{privapp-permissions-qti.xml => privapp-permissions-qti-system.xml} (94%)

diff --git a/configs/privapp-permissions-qti-product.xml b/configs/privapp-permissions-qti-product.xml
new file mode 100644
index 00000000..2ffbadbe
--- /dev/null
+++ b/configs/privapp-permissions-qti-product.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2017, The Linux Foundation. All rights reserved.
+
+  ~ Not a Contribution.
+-->
+
+<!--
+  ~ Copyright (C) 2016 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
+  -->
+
+<!--
+This XML file declares which signature|privileged permissions should be
+granted to privileged applications on QTI devices.
+It allows additional grants on top of privapp-permissions-platform.xml
+-->
+
+<permissions>
+    <privapp-permissions package="com.qualcomm.qcrilmsgtunnel">
+      <permission name="android.permission.INTERACT_ACROSS_USERS"/>
+    </privapp-permissions>
+
+    <privapp-permissions package="org.codeaurora.ims">
+      <permission name="android.permission.READ_PRECISE_PHONE_STATE"/>
+      <permission name="android.permission.INTERACT_ACROSS_USERS"/>
+      <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
+    </privapp-permissions>
+</permissions>
diff --git a/configs/privapp-permissions-qti.xml b/configs/privapp-permissions-qti-system.xml
similarity index 94%
rename from configs/privapp-permissions-qti.xml
rename to configs/privapp-permissions-qti-system.xml
index fe726f27..4794c705 100644
--- a/configs/privapp-permissions-qti.xml
+++ b/configs/privapp-permissions-qti-system.xml
@@ -37,10 +37,6 @@ It allows additional grants on top of privapp-permissions-platform.xml
       <permission name="android.permission.INTERACT_ACROSS_USERS"/>
     </privapp-permissions>
 
-    <privapp-permissions package="com.qualcomm.qcrilmsgtunnel">
-      <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-    </privapp-permissions>
-
     <privapp-permissions package="se.dirac.acs">
       <permission name="android.permission.INTERACT_ACROSS_USERS"/>
     </privapp-permissions>
@@ -129,12 +125,6 @@ It allows additional grants on top of privapp-permissions-platform.xml
       <permission name="android.permission.MODIFY_PHONE_STATE"/>
     </privapp-permissions>
 
-    <privapp-permissions package="org.codeaurora.ims">
-      <permission name="android.permission.READ_PRECISE_PHONE_STATE"/>
-      <permission name="android.permission.INTERACT_ACROSS_USERS"/>
-      <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
-    </privapp-permissions>
-
     <privapp-permissions package="com.android.soundrecorder">
       <permission name="android.permission.WRITE_MEDIA_STORAGE"/>
       <permission name="android.permission.CAPTURE_AUDIO_OUTPUT"/>
diff --git a/sdm660.mk b/sdm660.mk
index ccc68692..b977c09e 100644
--- a/sdm660.mk
+++ b/sdm660.mk
@@ -68,7 +68,8 @@ DEVICE_PACKAGE_OVERLAYS += \
 
 # Permissions
 PRODUCT_COPY_FILES += \
-    $(COMMON_PATH)/configs/privapp-permissions-qti.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-qti.xml \
+    $(COMMON_PATH)/configs/privapp-permissions-qti-product.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/privapp-permissions-qti.xml \
+    $(COMMON_PATH)/configs/privapp-permissions-qti-system.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-qti.xml \
     $(COMMON_PATH)/configs/privapp-permissions-hotword.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-hotword.xml
 
 PRODUCT_COPY_FILES += \