Twrp 3.3.0 update

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 1d91ae44f9c40ad3d6631f7d6eed482e3ebb69fe..e5357731c7a14e9061a6f1f5203561295309f3fb 100644 (file)
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -77,7 +77,7 @@ BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
 
 # Partitions (listed in the file) to be wiped under recovery.
 TARGET_RECOVERY_WIPE := device/oneplus/fajita/recovery.wipe
-TARGET_RECOVERY_FSTAB := device/oneplus/fajita/fstab.hardware
+TARGET_RECOVERY_FSTAB := device/oneplus/fajita/recovery.fstab
 
 
 # Workaround for error copying vendor files to recovery ramdisk
@@ -101,13 +101,12 @@ AB_OTA_UPDATER := true
 TW_INPUT_BLACKLIST := "hbtp_vm"
 TW_MAX_BRIGHTNESS := 1023
 TW_DEFAULT_BRIGHTNESS := 420
-TW_THEME := portrait_hdpi_notch
+TW_THEME := portrait_hdpi
 TARGET_RECOVERY_DEVICE_MODULES += android.hardware.boot@1.0
 TARGET_USE_CUSTOM_LUN_FILE_PATH := /config/usb_gadget/g1/functions/mass_storage.0/lun.%d/file
 TARGET_RECOVERY_PIXEL_FORMAT := BGRA_8888
 TW_NO_SCREEN_BLANK := true
 TW_USE_TOOLBOX := true
-TW_NO_LEGACY_PROPS := true
 
 # Use mke2fs to create ext4 images
 TARGET_USES_MKE2FS := true
@@ -125,7 +124,7 @@ AB_OTA_PARTITIONS += \
 # Encryption
 PLATFORM_SECURITY_PATCH := 2025-12-31
 TW_INCLUDE_CRYPTO := true
-TW_INCLUDE_CRYPTO_FBE := true
+#TW_INCLUDE_CRYPTO_FBE := true
 
 # Extras
 BOARD_SUPPRESS_SECURE_ERASE := true
@@ -133,3 +132,7 @@ TW_USE_LEDS_HAPTICS := true
 USE_RECOVERY_INSTALLER := true
 RECOVERY_INSTALLER_PATH := device/oneplus/fajita/installer
 TW_EXCLUDE_TWRPAPP := true
+TW_INCLUDE_REPACKTOOLS := true
+TW_Y_OFFSET := 80
+TW_H_OFFSET := -80
+TW_HAS_EDL_MODE := true

diff --git a/fstab.hardware b/fstab.hardware
deleted file mode 100644 (file)
index ab58257..0000000
--- a/fstab.hardware
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-#       copyright notice, this list of conditions and the following
-#       disclaimer in the documentation and/or other materials provided
-#       with the distribution.
-#     * Neither the name of The Linux Foundation nor the names of its
-#       contributors may be used to endorse or promote products derived
-#       from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# A/B recovery.fstab variant.
-
-#device         mount point      fstype        [device2] [length=]
-
-/dev/block/bootdevice/by-name/system       /system               ext4    ro,barrier=1                                                    wait,slotselect
-/dev/block/bootdevice/by-name/op2          /op2            ext4    noatime,nosuid,nodev,barrier=1,data=ordered                     wait,check
-/dev/block/bootdevice/by-name/vendor       /vendor         ext4    ro,barrier=1                                                    wait,slotselect
-/dev/block/bootdevice/by-name/userdata     /data           ext4    noatime,nosuid,nodev,barrier=1,data=ordered,noauto_da_alloc     wait,check,fileencryption=ice:aes-256-cts
-/dev/block/bootdevice/by-name/userdata     /data           f2fs    noatime,nosuid,nodev,discard                                    wait,check,fileencryption=ice:aes-256-cts
-/dev/block/mmcblk0p1                       /sdcard         vfat    nosuid,nodev                                                    wait
-/dev/block/bootdevice/by-name/boot         /boot           emmc    defaults                                                        defaults
-/dev/block/bootdevice/by-name/misc         /misc           emmc    defaults                                                        defaults

diff --git a/recovery.fstab b/recovery.fstab
index 9fd369c8eaf8f74ff8e3fae10d8e29c48535aab3..9e2f900ea4c4c94877b196f014399956103612af 100644 (file)
--- a/recovery.fstab
+++ b/recovery.fstab
@@ -29,10 +29,10 @@
 
 #device         mount point      fstype        [device2] [length=]
 
-/dev/block/bootdevice/by-name/system       /system               ext4    ro,barrier=1                                                    wait,slotselect
+/dev/block/bootdevice/by-name/system       /               ext4    ro,barrier=1                                                    wait,slotselect,avb
 /dev/block/bootdevice/by-name/op2          /op2            ext4    noatime,nosuid,nodev,barrier=1,data=ordered                     wait,check
-/dev/block/bootdevice/by-name/vendor       /vendor         ext4    ro,barrier=1                                                    wait,slotselect
-/dev/block/bootdevice/by-name/userdata     /data           ext4    noatime,nosuid,nodev,barrier=1,data=ordered,noauto_da_alloc     wait,check,fileencryption=ice,quota,reservedsize=512M
+/dev/block/bootdevice/by-name/vendor       /vendor         ext4    ro,barrier=1                                                    wait,slotselect,avb
+/dev/block/bootdevice/by-name/userdata     /data           ext4    noatime,nosuid,nodev,barrier=1,data=ordered,noauto_da_alloc     wait,check,fileencryption=ice
 /dev/block/bootdevice/by-name/userdata     /data           f2fs    noatime,nosuid,nodev,discard                                    wait,check,fileencryption=ice,quota
 /dev/block/mmcblk0p1                       /sdcard         vfat    nosuid,nodev                                                    wait
 /dev/block/bootdevice/by-name/boot         /boot           emmc    defaults                                                        defaults

diff --git a/recovery/root/init.recovery.qcom.rc b/recovery/root/init.recovery.qcom.rc
index a4c2c5de3a4285deb19dfe38e890602c961b62e7..57db6d905915d242caba9faf3d11b532fdbb4fd7 100644 (file)
--- a/recovery/root/init.recovery.qcom.rc
+++ b/recovery/root/init.recovery.qcom.rc
@@ -118,7 +118,7 @@ on init
     start boot-1-0
     start prepdecrypt
     start time_daemon
-    #setprop crypto.ready 1
+    setprop crypto.ready 1
 
 on property:crypto.ready=0
     stop sbinqseecomd

diff --git a/recovery/root/sbin/hwservicemanager b/recovery/root/sbin/hwservicemanager
new file mode 100644 (file)
index 0000000..7619db9
Binary files /dev/null and b/recovery/root/sbin/hwservicemanager differ

diff --git a/recovery/root/sbin/prepdecrypt.sh b/recovery/root/sbin/prepdecrypt.sh
index 01809d608a6c30cc9e3ea52468eb811042466626..3eadc416b5533c9917357074cfe5bed3936b4f3d 100755 (executable)
--- a/recovery/root/sbin/prepdecrypt.sh
+++ b/recovery/root/sbin/prepdecrypt.sh
@@ -92,7 +92,6 @@ cp /v/lib64/vendor.qti.hardware.tui_comm@1.0.so /vendor/lib64/
 cp /v/lib64/hw/bootctrl.sdm845.so /vendor/lib64/hw/
 cp /v/lib64/hw/android.hardware.boot@1.0-impl.so /vendor/lib64/hw/
 cp /v/lib64/hw/android.hardware.gatekeeper@1.0-impl-qti.so /vendor/lib64/hw/
-cp /v/lib64/hw/android.hardware.keymaster@3.0-impl-qti.so /vendor/lib64/hw/
 
 cp /v/manifest.xml /vendor/
 cp /v/compatibility_matrix.xml /vendor/

diff --git a/recovery/root/vendor/lib64/hw/android.hardware.keymaster@3.0-impl-qti.so b/recovery/root/vendor/lib64/hw/android.hardware.keymaster@3.0-impl-qti.so
deleted file mode 100644 (file)
index 92b2822..0000000
Binary files a/recovery/root/vendor/lib64/hw/android.hardware.keymaster@3.0-impl-qti.so and /dev/null differ