From 8e3770406176d66e3f2c08c2ef8cd6e656515a33 Mon Sep 17 00:00:00 2001
From: Christopher Roy Bratusek <nano@jpberlin.de>
Date: Sat, 17 Oct 2020 22:47:04 +0200
Subject: [PATCH] CommonInstaller: minor upgrades

---
 CommonInstaller                          |  9 +--------
 Full/system/etc/permissions/features.xml | 23 -----------------------
 Full/system/etc/sysconfig/microg-a5k.xml |  1 +
 3 files changed, 2 insertions(+), 31 deletions(-)
 delete mode 100644 Full/system/etc/permissions/features.xml

diff --git a/CommonInstaller b/CommonInstaller
index 897e0c4..cf809c2 100644
--- a/CommonInstaller
+++ b/CommonInstaller
@@ -1085,14 +1085,7 @@ install_microg () {
 			nanodroid_install_apk ${app}
 		done
 
-		nanodroid_install_file etc/permissions/features.xml
 		nanodroid_install_file etc/sysconfig/microg-a5k.xml
-
-		# android.permission.ACCESS_BACKGROUND_LOCATION only on SDK 29+
-		if [ "${SDK_VERSION}" -lt 29 ]; then
-			sed -e '/android.permission.ACCESS_BACKGROUND_LOCATION/d' \
-			-i "${INSTALLER}/system/etc/default-permissions/microg-permissions.xml"
-		fi
 		nanodroid_install_file etc/default-permissions/microg-permissions.xml
 
 	else	print_info " << without microG"
@@ -1584,7 +1577,7 @@ nanodroid_install_apk () {
 	cp "${source}.zst" "${dest}/${dest_apk}.zst" || \
 		error "failed to install ${source} to ${dest}"
 
-	${ZSTD} -fd "${dest}/${dest_apk}.zst" || \
+	${ZSTD} -fd --rm "${dest}/${dest_apk}.zst" || \
 		error "failed to decompress ${dest}/${dest_apk}.zst"
 
 	installinfo_add "${dest}/${dest_apk}"
diff --git a/Full/system/etc/permissions/features.xml b/Full/system/etc/permissions/features.xml
deleted file mode 100644
index 6a69321..0000000
--- a/Full/system/etc/permissions/features.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- This is the standard set of features for an auto-focus camera. -->
-<permissions>
-    <feature name="com.google.android.feature.GOOGLE_BUILD" />
-<!-- This should be added to all Nexus and GPe devices -->
-    <feature name="com.google.android.feature.GOOGLE_EXPERIENCE" />
-</permissions>
-
diff --git a/Full/system/etc/sysconfig/microg-a5k.xml b/Full/system/etc/sysconfig/microg-a5k.xml
index 4cd6554..177da9e 100644
--- a/Full/system/etc/sysconfig/microg-a5k.xml
+++ b/Full/system/etc/sysconfig/microg-a5k.xml
@@ -20,6 +20,7 @@
     <allow-in-power-save package="com.google.android.gms" />
     <allow-in-data-usage-save package="com.google.android.gms" />
     <allow-unthrottled-location package="com.google.android.gms" />
+    <allow-ignore-location-settings package="com.google.android.gms" />
 
     <!-- Ensure app store applications has internet access to manage updates. -->
     <allow-in-power-save-except-idle package="com.android.vending" />