From 264a218a79c3299258189c6ece0de86749a1deeb Mon Sep 17 00:00:00 2001 From: Chris Renshaw Date: Tue, 7 Jan 2025 00:25:53 -0400 Subject: [PATCH] Support more PIH and PPU variants and hybrids --- module/common_setup.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/module/common_setup.sh b/module/common_setup.sh index 29f9095..a6fc948 100644 --- a/module/common_setup.sh +++ b/module/common_setup.sh @@ -66,14 +66,13 @@ if [ -n "$(resetprop ro.aospa.version)" -o -n "$(resetprop net.pixelos.version)" done fi -# Work around supported custom ROM PropImitationHooks conflict when spoofProvider is disabled -if resetprop | grep -q "persist.sys.pihooks"; then +# Work around supported custom ROM PropImitationHooks/PixelPropsUtils (and hybrids) conflict when spoofProvider is disabled +if resetprop | grep -qE "persist.sys.pihooks|persist.sys.entryhooks|persist.sys.pixelprops"; then resetprop -n -p persist.sys.pihooks.disable.gms_props true resetprop -n -p persist.sys.pihooks.disable.gms_key_attestation_block true -fi - -# Work around supported custom ROM PixelPropsUtils conflict when spoofProvider is disabled -if resetprop | grep -q "persist.sys.pixelprops"; then + resetprop -n -p persist.sys.entryhooks_enabled false resetprop -n -p persist.sys.pixelprops.gms false + resetprop -n -p persist.sys.pixelprops.gapps false + resetprop -n -p persist.sys.pixelprops.google false resetprop -n -p persist.sys.pixelprops.pi false fi