diff --git a/ChangeLog.md b/ChangeLog.md index 7c6715e..1a139db 100644 --- a/ChangeLog.md +++ b/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 diff --git a/CommonInstaller b/CommonInstaller index d2ad2aa..1bbf065 100644 --- a/CommonInstaller +++ b/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 ;; diff --git a/Full/gsync/etc/permissions/privapp-permissions-gsync.xml b/Full/gsync/etc/permissions/privapp-permissions-gsync.xml deleted file mode 100644 index 0d972e8..0000000 --- a/Full/gsync/etc/permissions/privapp-permissions-gsync.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/Full/system/etc/permissions/privapp-permissions-phonesky.xml b/Full/system/etc/permissions/privapp-permissions-google.xml similarity index 79% rename from Full/system/etc/permissions/privapp-permissions-phonesky.xml rename to Full/system/etc/permissions/privapp-permissions-google.xml index 0518866..eae5451 100644 --- a/Full/system/etc/permissions/privapp-permissions-phonesky.xml +++ b/Full/system/etc/permissions/privapp-permissions-google.xml @@ -1,5 +1,15 @@ + + + + + + + + + + diff --git a/Full/system/etc/permissions/privapp-permissions-microg.xml b/Full/system/etc/permissions/privapp-permissions-microg.xml deleted file mode 100644 index 9d65827..0000000 --- a/Full/system/etc/permissions/privapp-permissions-microg.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - -