Revert "Revert "finalize permissions stuff""

This reverts commit 27d7cc1ae4.

ChangeLog.md

@@ -14,13 +14,10 @@
 ### General Changes
 
 * Full, microG packages
-  * split privapp-permissions-google.xml into
-     * privapp-permissions-microg.xml for microG GmsCore permissions
-     * privapp-permissions-phonesky.xml for Play Store permissions
+  * add privapp-permissions for BackupTransport
   * split microg-permissions.xml into
      * microg-permissions.xml for microG GmsCore and uNlp permissions
      * phonesky-permissions.xml for Play Store permissions
-  * add privapp-permissions-gsync.xml for BackupTransport permissions
 
 * CommonInstaller
   * make GApps removal mechanism less brutal

CommonInstaller

@@ -709,7 +709,7 @@ install_microg () {
 		fi
 
 		nanodroid_install_file etc/permissions/features.xml
-		nanodroid_install_file etc/permissions/privapp-permissions-microg.xml
+		nanodroid_install_file etc/permissions/privapp-permissions-google.xml
 		nanodroid_install_file etc/default-permissions/microg-permissions.xml
 		nanodroid_install_file etc/sysconfig/microg-a5k.xml
 
@@ -763,9 +763,6 @@ install_gsync () {
 			cp -r "${INSTALLER}/gsync/etc/default-permissions/" "${MODPATH}/system/etc/"
 			set_perm_data -r "${MODPATH}/system/etc/default-permissions/"
 
-			cp -r "${INSTALLER}/gsync/etc/permissions/" "${MODPATH}/system/etc/"
-			set_perm_data -r "${MODPATH}/system/etc/permissions/"
-
 			find "${INSTALLER}/gsync/etc/default-permissions/" -type f | \
 					sed -e "s,${INSTALLER}/gsync/etc,/system/etc,g" | \
 					installinfo_add
@@ -839,7 +836,6 @@ install_store () {
 			NANODROID_APP_STORE="Phonesky"
 			NANODROID_REM_STORE="FakeStore"
 
-			nanodroid_install_file etc/permissions/privapp-permissions-phonesky.xml
 			nanodroid_install_file etc/default-permissions/phonesky-permissions.xml
 		;;
 

Full/gsync/etc/permissions/privapp-permissions-gsync.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<permissions>
-	<privapp-permissions package="com.google.android.backuptransport">
-		<permission name="android.permission.BACKUP"/>
-		<permission name="android.permission.UPDATE_DEVICE_STATS"/>
-	</privapp-permissions>
-</permissions>

Full/system/etc/permissions/privapp-permissions-google.xml

@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <permissions>
+	<privapp-permissions package="com.google.android.gms">
+		<permission name="android.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST"/>
+		<permission name="android.permission.INSTALL_LOCATION_PROVIDER"/>
+	</privapp-permissions>
+
+	<privapp-permissions package="com.google.android.backuptransport">
+		<permission name="android.permission.BACKUP"/>
+		<permission name="android.permission.UPDATE_DEVICE_STATS"/>
+	</privapp-permissions>
+
 	<privapp-permissions package="com.android.vending">
 		<permission name="android.permission.ALLOCATE_AGGRESSIVE"/>
 		<permission name="android.permission.BACKUP"/>

Full/system/etc/permissions/privapp-permissions-microg.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<permissions>
-	<privapp-permissions package="com.google.android.gms">
-		<permission name="android.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST"/>
-		<permission name="android.permission.INSTALL_LOCATION_PROVIDER"/>
-	</privapp-permissions>
-</permissions>