Merge branch 'master' into 'master'

App stores fix

See merge request Nanolx/NanoDroid!19

CommonInstaller

@@ -1003,7 +1003,6 @@ install_store () {
 		3 )
 			ui_print " << with Aurora Store"
 			nanodroid_install_apk AuroraStore
-			nanodroid_install_file etc/permissions/com.aurora.store.xml
 		;;
 
 		* )

Full/system/etc/permissions/com.aurora.store.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<permissions>
-    <privapp-permissions package="com.aurora.store">
-        <permission name="android.permission.INSTALL_PACKAGES"/>
-    </privapp-permissions>
-</permissions>

Full/system/etc/sysconfig/microg-a5k.xml

@@ -24,6 +24,8 @@
     <!-- Ensure app store applications has internet access to manage updates. -->
     <allow-in-power-save-except-idle package="com.android.vending" />
     <allow-in-power-save-except-idle package="org.fdroid.fdroid" />
+    <allow-in-power-save-except-idle package="com.aurora.store" />
+    <allow-in-power-save-except-idle package="com.github.yeriomin.yalpstore" />
 
     <!-- Bare minimum microG components. -->
     <app-link package="com.google.android.gms" />

data/build-package.database

@@ -27,7 +27,7 @@ fd_NLPNOMINATIM=(fdroid org.microg.nlp.backend.nominatim app nlpBackendNominatim
 fd_NLPAPPLE=(fdroid org.microg.nlp.backend.apple app nlpBackendApple)
 fd_NLPRADIOCELL=(fdroid org.openbmap.unifiedNlp app nlpBackendRadiocell)
 fd_YALPSTORE=(fdroid com.github.yeriomin.yalpstore priv-app YalpStore)
-fd_AURORASTORE=(fdroid com.aurora.store priv-app AuroraStore)
+fd_AURORASTORE=(fdroid com.aurora.store app AuroraStore)
 
 ###
 # F-Droid
@@ -140,6 +140,7 @@ files_database=( Full/gsync/K/app/GoogleCalendarSync/GoogleCalendarSync.apk
 	Full/swipe/x86_64/libjni_latinimegoogle.so
 	Full/system/app/Amaze/Amaze.apk
 	Full/system/app/AnysoftKeyboard/AnysoftKeyboard.apk
+	Full/system/app/AuroraStore/AuroraStore.apk
 	Full/system/app/BeHeKeyboard/BeHeKeyboard.apk
 	Full/system/app/Blokada/Blokada.apk
 	Full/system/app/FDroid/FDroid.apk
@@ -178,7 +179,6 @@ files_database=( Full/gsync/K/app/GoogleCalendarSync/GoogleCalendarSync.apk
 	Full/system/priv-app/FakeStore/FakeStore.apk
 	Full/system/priv-app/Phonesky/Phonesky.apk
 	Full/system/priv-app/YalpStore/YalpStore.apk
-	Full/system/priv-app/AuroraStore/AuroraStore.apk
 	Full/system/priv-app/GsfProxy/GsfProxy.apk
 	Full/system/priv-app/GmsCore_NanoDroid/GmsCore_NanoDroid.apk
 	Full/system/priv-app/GmsCore_Official/GmsCore_Official.apk

data/build-package.pkg-microg

@@ -8,13 +8,13 @@ create_microg_package() {
 
 	cd "${CWD}/Full"
 
-	for app in DroidGuard nlpBackendApple nlpBackendDejavu \
+	for app in AuroraStore DroidGuard nlpBackendApple nlpBackendDejavu \
 		nlpBackendIchnaea nlpBackendNominatim nlpBackendRadiocell; do
 		zip_add "system/app/${app}/"
 	done
 
 	for app in FakeStore GmsCore_Official GmsCore_NanoDroid \
-		Phonesky GsfProxy YalpStore AuroraStore; do
+		Phonesky GsfProxy YalpStore; do
 		zip_add "system/priv-app/${app}/"
 	done