android/device_phh_treble
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename all calls to resetprop to resetprop_phh to prevent conflict with Magisk, see d8056f8032

Browse Source
This commit is contained in:
Pierre-Hugues Husson 2021-02-22 10:04:19 +01:00
parent f87c653336
commit b74ad8ea7e
3 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
base.mk
View File

@ -152,7 +152,8 @@ PRODUCT_PACKAGES += \
Stk Stk
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
resetprop resetprop_phh
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
device/phh/treble/phh-securize.sh:system/bin/phh-securize.sh \ device/phh/treble/phh-securize.sh:system/bin/phh-securize.sh \
device/phh/treble/files/ota.sh:system/bin/ota.sh \ device/phh/treble/files/ota.sh:system/bin/ota.sh \

4
phh-prop-handler.sh
View File

@ -106,9 +106,9 @@ if [ "$1" == "persist.sys.phh.disable_audio_effects" ];then
fi fi
if [[ "$prop_value" == 1 ]];then if [[ "$prop_value" == 1 ]];then
resetprop ro.audio.ignore_effects true resetprop_phh ro.audio.ignore_effects true
else else
resetprop --delete ro.audio.ignore_effects resetprop_phh --delete ro.audio.ignore_effects
fi fi
restartAudio restartAudio
exit exit

42
rw-system.sh
View File

@ -56,7 +56,7 @@ vndk="$(getprop persist.sys.vndk)"
[ -z "$vndk" ] && vndk="$(getprop ro.vndk.version |grep -oE '^[0-9]+')" [ -z "$vndk" ] && vndk="$(getprop ro.vndk.version |grep -oE '^[0-9]+')"
if [ "$vndk" = 26 ];then if [ "$vndk" = 26 ];then
resetprop ro.vndk.version 26 resetprop_phh ro.vndk.version 26
fi fi
setprop sys.usb.ffs.aio_compat true setprop sys.usb.ffs.aio_compat true
@ -623,7 +623,7 @@ if [ -f /system/phh/secure ];then
copyprop() { copyprop() {
p="$(getprop "$2")" p="$(getprop "$2")"
if [ "$p" ]; then if [ "$p" ]; then
resetprop "$1" "$(getprop "$2")" resetprop_phh "$1" "$(getprop "$2")"
fi fi
} }
@ -653,26 +653,26 @@ if [ -f /system/phh/secure ];then
copyprop ro.system.product.manufacturer ro.product.vendor.manufacturer copyprop ro.system.product.manufacturer ro.product.vendor.manufacturer
copyprop ro.product.manufacturer ro.product.vendor.manufacturer copyprop ro.product.manufacturer ro.product.vendor.manufacturer
(getprop ro.vendor.build.security_patch; getprop ro.keymaster.xxx.security_patch) |sort |tail -n 1 |while read v;do (getprop ro.vendor.build.security_patch; getprop ro.keymaster.xxx.security_patch) |sort |tail -n 1 |while read v;do
[ -n "$v" ] && resetprop ro.build.version.security_patch "$v" [ -n "$v" ] && resetprop_phh ro.build.version.security_patch "$v"
done done
resetprop ro.build.tags release-keys resetprop_phh ro.build.tags release-keys
resetprop ro.boot.vbmeta.device_state locked resetprop_phh ro.boot.vbmeta.device_state locked
resetprop ro.boot.verifiedbootstate green resetprop_phh ro.boot.verifiedbootstate green
resetprop ro.boot.flash.locked 1 resetprop_phh ro.boot.flash.locked 1
resetprop ro.boot.veritymode enforcing resetprop_phh ro.boot.veritymode enforcing
resetprop ro.boot.warranty_bit 0 resetprop_phh ro.boot.warranty_bit 0
resetprop ro.warranty_bit 0 resetprop_phh ro.warranty_bit 0
resetprop ro.debuggable 0 resetprop_phh ro.debuggable 0
resetprop ro.secure 1 resetprop_phh ro.secure 1
resetprop ro.build.type user resetprop_phh ro.build.type user
resetprop ro.build.selinux 0 resetprop_phh ro.build.selinux 0
resetprop ro.adb.secure 1 resetprop_phh ro.adb.secure 1
setprop ctl.restart adbd setprop ctl.restart adbd
fi fi
resetprop ro.adb.secure 0 resetprop_phh ro.adb.secure 0
setprop ctl.restart adbd setprop ctl.restart adbd
@ -767,7 +767,7 @@ if getprop ro.vendor.build.fingerprint | grep -iq \
fi fi
if getprop ro.build.overlay.deviceid |grep -qE '^RMX';then if getprop ro.build.overlay.deviceid |grep -qE '^RMX';then
resetprop ro.vendor.gsi.build.flavor byPass resetprop_phh ro.vendor.gsi.build.flavor byPass
setprop oppo.camera.packname com.oppo.engineermode.camera setprop oppo.camera.packname com.oppo.engineermode.camera
setprop sys.phh.xx.brand realme setprop sys.phh.xx.brand realme
fi fi
@ -807,7 +807,7 @@ if getprop ro.vendor.build.fingerprint |grep -qiE \
-e razer/cheryl ; then -e razer/cheryl ; then
setprop media.settings.xml "/vendor/etc/media_profiles_vendor.xml" setprop media.settings.xml "/vendor/etc/media_profiles_vendor.xml"
fi fi
resetprop service.adb.root 0 resetprop_phh service.adb.root 0
setprop persist.sys.usb.config mtp,adb setprop persist.sys.usb.config mtp,adb
@ -848,7 +848,7 @@ if getprop ro.build.overlay.deviceid |grep -iq -e RMX2185 -e RMX1941 -e RMX1945
setprop persist.sys.overlay.devinputjack true setprop persist.sys.overlay.devinputjack true
fi fi
resetprop ro.bluetooth.library_name libbluetooth.so resetprop_phh ro.bluetooth.library_name libbluetooth.so
if getprop ro.vendor.build.fingerprint |grep -iq xiaomi/cepheus;then if getprop ro.vendor.build.fingerprint |grep -iq xiaomi/cepheus;then
setprop ro.netflix.bsp_rev Q855-16947-1 setprop ro.netflix.bsp_rev Q855-16947-1
@ -867,12 +867,12 @@ fi
setprop vendor.display.res_switch_en 1 setprop vendor.display.res_switch_en 1
if getprop ro.bionic.cpu_variant |grep -q kryo300;then if getprop ro.bionic.cpu_variant |grep -q kryo300;then
resetprop ro.bionic.cpu_variant cortex-a75 resetprop_phh ro.bionic.cpu_variant cortex-a75
setprop dalvik.vm.isa.arm64.variant cortex-a75 setprop dalvik.vm.isa.arm64.variant cortex-a75
setprop dalvik.vm.isa.arm64.features runtime setprop dalvik.vm.isa.arm64.features runtime
fi fi
resetprop ro.control_privapp_permissions log resetprop_phh ro.control_privapp_permissions log
if [ -f /vendor/etc/init/vendor.ozoaudio.media.c2@1.0-service.rc ];then if [ -f /vendor/etc/init/vendor.ozoaudio.media.c2@1.0-service.rc ];then
if [ "$vndk" -le 29 ]; then if [ "$vndk" -le 29 ]; then