From c975dcb97b9ef666564ef0a24130f6f90835be1b Mon Sep 17 00:00:00 2001
From: Christopher Roy Bratusek <nano@jpberlin.de>
Date: Mon, 30 Jul 2018 20:32:54 +0200
Subject: [PATCH] improve GApps removal mechanism

---
 CommonInstaller                                       | 11 +++++------
 .../etc/permissions/privapp-permissions-google.xml    |  6 ++++++
 2 files changed, 11 insertions(+), 6 deletions(-)
 create mode 100644 Full/system/etc/permissions/privapp-permissions-google.xml

diff --git a/CommonInstaller b/CommonInstaller
index d7ab9cd..8da5bf8 100644
--- a/CommonInstaller
+++ b/CommonInstaller
@@ -595,9 +595,11 @@ install_microg () {
 			rm -rf /data/user_de/*/${app}
 			rm -rf /data/app/${app}-*
 
-			if ! grep -q 'com.google.android.gms' /data/system/users/*/runtime-permissions.xml; then
-				rm -f /data/system/users/*/runtime-permissions.xml
-			fi
+			for file in /data/system/users/*/runtime-permissions.xml; do
+				if grep -q "${app}" "${file}"; then
+					rm -f "${file}"
+				fi
+			done
 		fi
 
 		case ${nanodroid_nlpbackend} in
@@ -619,9 +621,6 @@ install_microg () {
 		nanodroid_install_file etc/default-permissions/microg-permissions.xml
 		nanodroid_install_file etc/sysconfig/microg-a5k.xml
 
-		if ! grep -q 'com.google.android.gms' /data/system/users/*/runtime-permissions.xml; then
-			rm /data/system/users/*/runtime-permissions.xml
-		fi
 	else	ui_print " << without microG"
 	fi
 }
diff --git a/Full/system/etc/permissions/privapp-permissions-google.xml b/Full/system/etc/permissions/privapp-permissions-google.xml
new file mode 100644
index 0000000..d4214ff
--- /dev/null
+++ b/Full/system/etc/permissions/privapp-permissions-google.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<permissions>
+    <privapp-permissions package="com.android.vending">
+        <permission name="android.permission.MANAGE_USERS"/>
+    </privapp-permissions>
+</permissions>