diff --git a/CommonInstaller b/CommonInstaller index 6c19d9e3..a282fb1f 100644 --- a/CommonInstaller +++ b/CommonInstaller @@ -1101,14 +1101,7 @@ install_microg () { nanodroid_install_apk GmsCore detect_migrate_apk com.google.android.gms GmsCore - if [ "${nanodroid_microg}" -ne 2 ]; then - for app in GsfProxy DroidGuard; do - nanodroid_install_apk ${app} - done - - detect_migrate_apk org.microg.gms.droidguard DroidGuard - ${NANODROID_BINDIR}/nanodroid-overlay --add GmsDroidGuard - fi + [ "${nanodroid_microg}" -ne 2 ] && nanodroid_install_apk GsfProxy NLPBACKEND="nlpBackendNominatim" print_info " ++ Nominatim geocoder backend" diff --git a/Full/system/bin/nanodroid-perm b/Full/system/bin/nanodroid-perm index 5a516efb..bdec1bab 100755 --- a/Full/system/bin/nanodroid-perm +++ b/Full/system/bin/nanodroid-perm @@ -18,7 +18,6 @@ perm_rsms="android.permission.RECEIVE_SMS" # Packages microG="com.google.android.gms" PlayStore="com.android.vending" -DroidGuard="org.microg.gms.droidguard" GCalSync="com.google.android.syncadapters.calendar" GConSync="com.google.android.syncadapters.contacts" nlpIchnaea="org.microg.nlp.backend.ichnaea" @@ -91,9 +90,6 @@ if [ "$(getprop ro.build.version.sdk)" -ge 29 ]; then user_install ${microG} fi -# microG DroidGuard Helper needs to be installed as user app to prevent crashes -user_install ${DroidGuard} - # Fake Package Signature permissions ${microG} ${perm_fake} permissions ${PlayStore} ${perm_fake} diff --git a/Full/system/etc/sysconfig/microg-a5k.xml b/Full/system/etc/sysconfig/microg-a5k.xml index eb53dc35..d3132c90 100644 --- a/Full/system/etc/sysconfig/microg-a5k.xml +++ b/Full/system/etc/sysconfig/microg-a5k.xml @@ -33,7 +33,6 @@ - @@ -48,7 +47,6 @@ - diff --git a/data/build-package.database b/data/build-package.database index 05e1a9a2..e087c8b9 100644 --- a/data/build-package.database +++ b/data/build-package.database @@ -13,8 +13,6 @@ nlx_PHONESKY=(nanolx com.android.vending priv-app Phonesky) uG_GMSCORE=(microg com.google.android.gms priv-app GmsCore) uG_GSFPROXY=(microg com.google.android.gsf priv-app GsfProxy) -uG_DROIDGUARD=(microg org.microg.gms.droidguard app DroidGuard) -nlx_DROIDGUARD=(nanolx org.microg.gms.droidguard app DroidGuard) uG_FAKESTORE=(microg com.android.vending priv-app FakeStore) fd_NLPDEJAVU=(fdroid org.fitchfamily.android.dejavu app nlpBackendDejavu) fd_NLPMOZILLA=(fdroid org.microg.nlp.backend.ichnaea app nlpBackendIchnaea) diff --git a/data/build-package.update b/data/build-package.update index 6c7aed60..24c4c781 100644 --- a/data/build-package.update +++ b/data/build-package.update @@ -59,7 +59,6 @@ grab_microg () { # applications managed in repositories grab_apk_from_repo ${uG_GMSCORE[@]} grab_apk_from_repo ${uG_GSFPROXY[@]} - grab_apk_from_repo ${nlx_DROIDGUARD[@]} grab_apk_from_repo ${uG_FAKESTORE[@]} grab_apk_from_repo ${fd_NLPDEJAVU[@]} grab_apk_from_repo ${fd_NLPMOZILLA[@]}