Merge branch 'soracqt-master-patch-66923' into 'master'

Soracqt master patch 66923

See merge request Nanolx/NanoDroid!37

data/service.sh

@@ -62,16 +62,61 @@ install_bromitewebview () {
 	fi
 }
 
+install_dejavulocationservice () {
+	# wait until boot completed
+	until [ $(getprop sys.boot_completed). = 1. ]; do sleep 1; done
+
+	if [ $(getprop ro.system.build.version.sdk) -ge 29 ]; then
+		# Déjà Vu - A local RF based back end for the µg Pro needs to be installed as user app for all permissions to be granted
+		if [ -f "${MODDIR}/system/app/nlpBackendDejavu/nlpBackendDejavu.apk" ]; then
+			pm list packages -f | grep -q /data.*org.fitchfamily.android.dejavu || \
+				pm install -r "${MODDIR}/system/app/nlpBackendDejavu/nlpBackendDejavu.apk" &
+		fi
+	fi
+}
+
+install_appleunifiednlpbackend () {
+	# wait until boot completed
+	until [ $(getprop sys.boot_completed). = 1. ]; do sleep 1; done
+
+	if [ $(getprop ro.system.build.version.sdk) -ge 29 ]; then
+		# Apple UnifiedNlp Backend needs to be installed as user app for all permissions to be granted
+		if [ -f "${MODDIR}/system/app/nlpBackendApple/nlpBackendApple.apk" ]; then
+			pm list packages -f | grep -q /data.*org.microg.nlp.backend.apple || \
+				pm install -r "${MODDIR}/system/app/nlpBackendApple/nlpBackendApple.apk" &
+		fi
+	fi
+}
+
+install_mozillanlpbackend () {
+	# wait until boot completed
+	until [ $(getprop sys.boot_completed). = 1. ]; do sleep 1; done
+
+	if [ $(getprop ro.system.build.version.sdk) -ge 29 ]; then
+		# MozillaNlpBackend needs to be installed as user app for all permissions to be granted
+		if [ -f "${MODDIR}/system/app/nlpBackendIchnaea/nlpBackendIchnaea.apk" ]; then
+			pm list packages -f | grep -q /data.*org.microg.nlp.backend.ichnaea || \
+				pm install -r "${MODDIR}/system/app/nlpBackendIchnaea/nlpBackendIchnaea.apk" &
+		fi
+	fi
+}
+
 case ${MODULE} in
 	NanoDroid )
 		run_initscripts &
 		install_droidguardhelper &
 		install_gmscore &
+                install_dejavulocationservice &
+                install_appleunifiednlpbackend &
+                install_mozillanlpbackend &
 	;;
 
 	NanoDroid_microG )
 		install_droidguardhelper &
 		install_gmscore &
+                install_dejavulocationservice &
+                install_appleunifiednlpbackend &
+                install_mozillanlpbackend &
 	;;
 
 	NanoDroid_BromiteWebView )