Merge branch 'master' into 'master'

Support new bromite webview package name

See merge request Nanolx/NanoDroid!41

CommonInstaller

@@ -517,11 +517,11 @@ check_fake_package_signature () {
 ##########################################################################################
 
 check_bromite_webview_support () {
-	WEBVIEW_PKG="com.android.webview"
+	WEBVIEW_PKG="org.bromite.webview"
 	HAS_WEBVIEW=false
 
 	${AAPT} dump xmltree /system/framework/framework-res.apk res/xml/config_webview_packages.xml | \
-		tr -d '\n' | sed -e 's/webviewprovider/\n/g' | grep com.android.webview | \
+		tr -d '\n' | sed -e 's/webviewprovider/\n/g' | grep org.bromite.webview | \
 		grep -q 'E: signature' || HAS_WEBVIEW=true
 
 	${HAS_WEBVIEW} && return 0 || return 1
@@ -1382,7 +1382,7 @@ install_bromite_webview () {
 			done
 
 			if [ "${NANODROID_UPGRADE}" -eq 0 ]; then
-				for app in com.android.webview; do
+				for app in org.bromite.webview; do
 					rm -rf /data/data/${app}
 					rm -rf /data/user/*/${app}
 					rm -rf /data/user_de/*/${app}

data/build-package.database

@@ -90,9 +90,9 @@ gl_AURORAWARDEN=(AuroraOSS/AppWarden app Warden)
 # Bromite WebView
 ###
 
-bm_WEBVIEW_arm64=(bromite com.android.webview app BromiteWebView_arm64 arm64-v8a)
-bm_WEBVIEW_arm=(bromite com.android.webview app BromiteWebView_arm armeabi-v7a)
-bm_WEBVIEW_x86=(bromite com.android.webview app BromiteWebView_x86 x86)
+bm_WEBVIEW_arm64=(bromite org.bromite.webview app BromiteWebView_arm64 arm64-v8a)
+bm_WEBVIEW_arm=(bromite org.bromite.webview app BromiteWebView_arm armeabi-v7a)
+bm_WEBVIEW_x86=(bromite org.bromite.webview app BromiteWebView_x86 x86)
 
 ###
 # OSM And+

data/build-package.download

@@ -234,7 +234,7 @@ grab_apk_from_repo () {
 	fi
 
 	case "${pkg_name}" in
-		com.android.webview )
+		org.bromite.webview )
 			local apk_dest="${appsfolder[12]}/${3}/${4}"
 		;;
 

data/service.sh

@@ -35,10 +35,10 @@ install_bromitewebview () {
 
 	# Bromite WebView needs to be installed as user app to prevent crashes
 	if [ -d "${MODDIR}/system/product/app" ]; then
-		pm list packages -f | grep -q /data.*com.android.webview || \
+		pm list packages -f | grep -q /data.*org.bromite.webview || \
 			pm install -r "${MODDIR}"/system/product/app/*/*.apk &
 	else
-		pm list packages -f | grep -q /data.*com.android.webview || \
+		pm list packages -f | grep -q /data.*org.bromite.webview || \
 			pm install -r "${MODDIR}"/system/app/*/*.apk &
 	fi
 }

systest/SysTest

@@ -273,11 +273,11 @@ check_fake_package_signature () {
 ##########################################################################################
 
 check_bromite_webview_support () {
-	WEBVIEW_PKG="com.android.webview"
+	WEBVIEW_PKG="org.bromite.webview"
 	HAS_WEBVIEW=false
 
 	${AAPT} dump xmltree /system/framework/framework-res.apk res/xml/config_webview_packages.xml | \
-		tr -d '\n' | sed -e 's/webviewprovider/\n/g' | grep com.android.webview | \
+		tr -d '\n' | sed -e 's/webviewprovider/\n/g' | grep org.bromite.webview | \
 		grep -q 'E: signature' || HAS_WEBVIEW=true
 
 	${HAS_WEBVIEW} && return 0 || return 1