2
0
mirror of https://gitlab.com/Nanolx/NanoDroid synced 2024-10-31 09:20:23 +00:00

CommonInstaller: minor upgrades

This commit is contained in:
Christopher Roy Bratusek 2020-10-17 22:47:04 +02:00
parent 4ab6d6b307
commit 8e37704061
3 changed files with 2 additions and 31 deletions

View File

@ -1085,14 +1085,7 @@ install_microg () {
nanodroid_install_apk ${app} nanodroid_install_apk ${app}
done done
nanodroid_install_file etc/permissions/features.xml
nanodroid_install_file etc/sysconfig/microg-a5k.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 nanodroid_install_file etc/default-permissions/microg-permissions.xml
else print_info " << without microG" else print_info " << without microG"
@ -1584,7 +1577,7 @@ nanodroid_install_apk () {
cp "${source}.zst" "${dest}/${dest_apk}.zst" || \ cp "${source}.zst" "${dest}/${dest_apk}.zst" || \
error "failed to install ${source} to ${dest}" 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" error "failed to decompress ${dest}/${dest_apk}.zst"
installinfo_add "${dest}/${dest_apk}" installinfo_add "${dest}/${dest_apk}"

View File

@ -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>

View File

@ -20,6 +20,7 @@
<allow-in-power-save package="com.google.android.gms" /> <allow-in-power-save package="com.google.android.gms" />
<allow-in-data-usage-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-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. --> <!-- 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="com.android.vending" />