From 9fdd9304b1c46a804c4fb10f89680e60f32bec3b Mon Sep 17 00:00:00 2001
From: Palakurthi Sreekanth <palakurthisreekanth995@gmail.com>
Date: Sun, 21 Mar 2021 15:42:32 +0100
Subject: [PATCH] sdm710-common: grant permissions for carrier settings

java.lang.IllegalStateException: Signature|privileged permissions not in privapp-permissions whitelist: {com.google.android.carrier (/product/priv-app/CarrierSettings): android.permission.WRITE_APN_SETTINGS, com.google.android.carrier (/product/priv-app/CarrierSettings): android.permission.CHANGE_COMPONENT_ENABLED_STATE, com.google.android.carrier (/product/priv-app/CarrierSettings): android.permission.INTERACT_ACROSS_USERS, com.google.android.carrier (/product/priv-app/CarrierSettings): android.permission.MODIFY_PHONE_STATE, com.google.android.carrier (/product/priv-app/CarrierSettings): android.permission.READ_PRIVILEGED_PHONE_STATE, com.google.android.carrier (/product/priv-app/CarrierSettings): com.android.permission.INSTALL_EXISTING_PACKAGES}
---
 configs/qti_whitelist.xml                           |  2 ++
 .../privapp-permissions-google-carriersettings.xml  | 13 +++++++++++++
 sdm710.mk                                           |  3 ++-
 3 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 permissions/privapp-permissions-google-carriersettings.xml

diff --git a/configs/qti_whitelist.xml b/configs/qti_whitelist.xml
index 9ef9bf9..2db6e93 100644
--- a/configs/qti_whitelist.xml
+++ b/configs/qti_whitelist.xml
@@ -68,4 +68,6 @@
     <hidden-api-whitelisted-app package="com.qualcomm.wfd.client" />
     <hidden-api-whitelisted-app package="com.qualcomm.wfd.service" />
     <allow-implicit-broadcast action="org.codeaurora.intent.action.PRE_ALERTING_CALL_INFO" />
+
+    <hidden-api-whitelisted-app package="com.google.android.carrier" />
 </config>
diff --git a/permissions/privapp-permissions-google-carriersettings.xml b/permissions/privapp-permissions-google-carriersettings.xml
new file mode 100644
index 0000000..47c710f
--- /dev/null
+++ b/permissions/privapp-permissions-google-carriersettings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<permissions>
+
+    <privapp-permissions package="com.google.android.carrier">
+        <permission name="android.permission.WRITE_APN_SETTINGS"/>
+        <permission name="android.permission.CHANGE_COMPONENT_ENABLED_STATE" />
+        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
+        <permission name="android.permission.MODIFY_PHONE_STATE"/>
+        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
+        <permission name="com.android.permission.INSTALL_EXISTING_PACKAGES" />
+    </privapp-permissions>
+
+</permissions>
\ No newline at end of file
diff --git a/sdm710.mk b/sdm710.mk
index b9682f3..c465627 100644
--- a/sdm710.mk
+++ b/sdm710.mk
@@ -363,7 +363,8 @@ PRODUCT_PACKAGES += \
 
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/qti_whitelist.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/sysconfig/qti_whitelist.xml \
-    $(LOCAL_PATH)/configs/privapp-permissions-qti.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/privapp-permissions-qti.xml
+    $(LOCAL_PATH)/configs/privapp-permissions-qti.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/privapp-permissions-qti.xml \
+    $(LOCAL_PATH)/permissions/privapp-permissions-google-carriersettings.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/privapp-permissions-google-carriersettings.xml
 
 # Radio
 PRODUCT_PACKAGES += \