mirror of
https://github.com/chiteroman/PlayIntegrityFix.git
synced 2025-01-19 03:22:39 +02:00
Merge pull request #104 from osm0sis/main
Move early props to post-fs-data.sh, warn about deprecated/conflicting MHPC module (main)
This commit is contained in:
commit
6c88a77ef4
@ -3,11 +3,14 @@ if [ "$API" -lt 26 ]; then
|
||||
abort "!!! You can't use this module on Android < 8.0"
|
||||
fi
|
||||
|
||||
# Remove safetynet-fix module if installed
|
||||
# Remove/warn if conflicting modules are installed
|
||||
if [ -d /data/adb/modules/safetynet-fix ]; then
|
||||
touch /data/adb/modules/safetynet-fix/remove
|
||||
ui_print "- 'safetynet-fix' module will be removed on next reboot"
|
||||
fi
|
||||
if [ -d /data/adb/modules/MagiskHidePropsConf ]; then
|
||||
ui_print "- Warning, 'MagiskHidePropsConf' module may cause issues with PIF"
|
||||
fi
|
||||
|
||||
# Clean up any leftover files from previous deprecated methods
|
||||
rm -f /data/data/com.google.android.gms/cache/pif.prop /data/data/com.google.android.gms/pif.prop
|
||||
|
@ -3,7 +3,43 @@ if magisk --denylist status; then
|
||||
magisk --denylist rm com.google.android.gms
|
||||
fi
|
||||
|
||||
# Remove safetynet-fix module if installed
|
||||
if [ -d /data/adb/modules/safetynet-fix ]; then
|
||||
touch /data/adb/modules/safetynet-fix/remove
|
||||
# Remove conflicting modules if installed
|
||||
for i in MagiskHidePropsConf safetynet-fix; do
|
||||
if [ -d /data/adb/modules/$i ]; then
|
||||
touch /data/adb/modules/$i/remove
|
||||
fi
|
||||
done
|
||||
|
||||
# Conditional early sensitive properties
|
||||
|
||||
resetprop_if_diff() {
|
||||
local NAME=$1
|
||||
local EXPECTED=$2
|
||||
local CURRENT=$(resetprop $NAME)
|
||||
|
||||
[ -z "$CURRENT" ] || [ "$CURRENT" == "$EXPECTED" ] || resetprop $NAME $EXPECTED
|
||||
}
|
||||
resetprop_if_match() {
|
||||
local NAME=$1
|
||||
local CONTAINS=$2
|
||||
local VALUE=$3
|
||||
|
||||
[[ "$(resetprop $NAME)" == *"$CONTAINS"* ]] && resetprop $NAME $VALUE
|
||||
}
|
||||
|
||||
# RootBeer, Microsoft
|
||||
resetprop_if_diff ro.build.tags release-keys
|
||||
|
||||
# Samsung
|
||||
resetprop_if_diff ro.boot.warranty_bit 0
|
||||
resetprop_if_diff ro.vendor.boot.warranty_bit 0
|
||||
resetprop_if_diff ro.vendor.warranty_bit 0
|
||||
resetprop_if_diff ro.warranty_bit 0
|
||||
|
||||
# OnePlus
|
||||
resetprop_if_diff ro.is_ever_orange 0
|
||||
|
||||
# Other
|
||||
resetprop_if_diff ro.build.type user
|
||||
resetprop_if_diff ro.debuggable 0
|
||||
resetprop_if_diff ro.secure 1
|
||||
|
@ -15,33 +15,15 @@ resetprop_if_match() {
|
||||
[[ "$(resetprop $NAME)" == *"$CONTAINS"* ]] && resetprop $NAME $VALUE
|
||||
}
|
||||
|
||||
# RootBeer, Microsoft
|
||||
resetprop_if_diff ro.build.tags release-keys
|
||||
|
||||
# Samsung
|
||||
resetprop_if_diff ro.boot.warranty_bit 0
|
||||
resetprop_if_diff ro.vendor.boot.warranty_bit 0
|
||||
resetprop_if_diff ro.vendor.warranty_bit 0
|
||||
resetprop_if_diff ro.warranty_bit 0
|
||||
|
||||
# OnePlus
|
||||
resetprop_if_diff ro.is_ever_orange 0
|
||||
|
||||
# Other
|
||||
resetprop_if_diff ro.build.type user
|
||||
resetprop_if_diff ro.debuggable 0
|
||||
resetprop_if_diff ro.secure 1
|
||||
|
||||
# Magisk recovery mode
|
||||
resetprop_if_match ro.bootmode recovery unknown
|
||||
resetprop_if_match ro.boot.mode recovery unknown
|
||||
resetprop_if_match vendor.boot.mode recovery unknown
|
||||
|
||||
# SELinux
|
||||
if [ -n "$(getprop ro.build.selinux)" ]; then
|
||||
if [ -n "$(resetprop ro.build.selinux)" ]; then
|
||||
resetprop --delete ro.build.selinux
|
||||
fi
|
||||
|
||||
# use toybox to protect *stat* access time reading
|
||||
if [ "$(toybox cat /sys/fs/selinux/enforce)" == "0" ]; then
|
||||
chmod 640 /sys/fs/selinux/enforce
|
||||
|
Loading…
Reference in New Issue
Block a user