From 2c53845cbe3b02c8e2a6458fff6a256057334606 Mon Sep 17 00:00:00 2001 From: bigbiff Date: Thu, 10 Feb 2022 16:20:19 -0500 Subject: [PATCH 1/4] sdcard: remove mount check Change-Id: I278d7f71e79a82a34f95dba197555d08960f2723 --- partition.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/partition.cpp b/partition.cpp index 69c34120..6d1825d8 100755 --- a/partition.cpp +++ b/partition.cpp @@ -703,8 +703,6 @@ void TWPartition::Setup_Data_Partition(bool Display_Error) { Primary_Block_Device.c_str(), Mount_Point.c_str()); } } else { - if (Is_Mounted()) - UnMount(true); Set_FBE_Status(); int is_device_fbe; DataManager::GetValue(TW_IS_FBE, is_device_fbe); From 36deede620332c02a08375df8ff68531bee1f393 Mon Sep 17 00:00:00 2001 From: Captain Throwback Date: Fri, 18 Feb 2022 16:30:03 -0500 Subject: [PATCH 2/4] soong: create phony package to fix dirty builds (2/2) Add twrp_soong as a required module to ensure twres folder is included in dirty builds where device out folder is removed Change-Id: I5b3f57664cd2aa97ff74ff594c72e6f29c6c927f --- prebuilt/Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk index d409be03..ec2bb19d 100755 --- a/prebuilt/Android.mk +++ b/prebuilt/Android.mk @@ -401,7 +401,7 @@ LOCAL_POST_INSTALL_CMD += \ LOCAL_POST_INSTALL_CMD += \ && cp $(TARGET_OUT_ETC)/mke2fs.conf $(TARGET_RECOVERY_ROOT_OUT)/system/etc/mke2fs.conf endif -LOCAL_REQUIRED_MODULES += init_second_stage.recovery reboot.recovery plat_service_contexts plat_hardware_contexts vndservice_contexts +LOCAL_REQUIRED_MODULES += init_second_stage.recovery reboot.recovery plat_service_contexts plat_hardware_contexts vndservice_contexts twrp_soong include $(BUILD_PHONY_PACKAGE) # copy license file for OpenAES From ffb034ec784c137d96f254fe546ee19acf6bd074 Mon Sep 17 00:00:00 2001 From: Darth9 Date: Fri, 25 Feb 2022 07:51:59 +0000 Subject: [PATCH 3/4] fscrypt_destroy_user_storage: continue when EnsurePolicy returns false Change-Id: I8a7d4343a12a7be346b96d27226f83d890a8597a --- crypto/fscrypt/FsCrypt.cpp | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/crypto/fscrypt/FsCrypt.cpp b/crypto/fscrypt/FsCrypt.cpp index 6284fa86..a2049a2a 100755 --- a/crypto/fscrypt/FsCrypt.cpp +++ b/crypto/fscrypt/FsCrypt.cpp @@ -875,13 +875,18 @@ bool fscrypt_prepare_user_storage(const std::string& volume_uuid, userid_t user_ EncryptionPolicy de_policy; if (volume_uuid.empty()) { if (!lookup_policy(s_de_policies, user_id, &de_policy)) return false; - if (!EnsurePolicy(de_policy, system_de_path)) return false; - if (!EnsurePolicy(de_policy, misc_de_path)) return false; - if (!EnsurePolicy(de_policy, vendor_de_path)) return false; + if (!EnsurePolicy(de_policy, system_de_path)) + LOG(INFO) << "EnsurePolicy returned false for " << system_de_path; + if (!EnsurePolicy(de_policy, misc_de_path)) + LOG(INFO) << "EnsurePolicy returned false for " << misc_de_path; + if (!EnsurePolicy(de_policy, vendor_de_path)) + LOG(INFO) << "EnsurePolicy returned false for " << vendor_de_path; } else { if (!read_or_create_volkey(misc_de_path, volume_uuid, &de_policy)) return false; } - if (!EnsurePolicy(de_policy, user_de_path)) return false; + if (!EnsurePolicy(de_policy, user_de_path)) + LOG(INFO) << "EnsurePolicy returned false for " << user_de_path; + } } @@ -906,14 +911,19 @@ bool fscrypt_prepare_user_storage(const std::string& volume_uuid, userid_t user_ EncryptionPolicy ce_policy; if (volume_uuid.empty()) { if (!lookup_policy(s_ce_policies, user_id, &ce_policy)) return false; - if (!EnsurePolicy(ce_policy, system_ce_path)) return false; - if (!EnsurePolicy(ce_policy, misc_ce_path)) return false; - if (!EnsurePolicy(ce_policy, vendor_ce_path)) return false; + if (!EnsurePolicy(ce_policy, system_ce_path)) + LOG(INFO) << "EnsurePolicy returned false for " << system_ce_path; + if (!EnsurePolicy(ce_policy, misc_ce_path)) + LOG(INFO) << "EnsurePolicy returned false for " << misc_ce_path; + if (!EnsurePolicy(ce_policy, vendor_ce_path)) + LOG(INFO) << "EnsurePolicy returned false for " << vendor_ce_path; } else { if (!read_or_create_volkey(misc_ce_path, volume_uuid, &ce_policy)) return false; } - if (!EnsurePolicy(ce_policy, media_ce_path)) return false; - if (!EnsurePolicy(ce_policy, user_ce_path)) return false; + if (!EnsurePolicy(ce_policy, media_ce_path)) + LOG(INFO) << "EnsurePolicy returned false for " << media_ce_path; + if (!EnsurePolicy(ce_policy, user_ce_path)) + LOG(INFO) << "EnsurePolicy returned false for " << user_ce_path; } if (volume_uuid.empty()) { From 4e406a053a090f3c35f1e29a368ad32db363253a Mon Sep 17 00:00:00 2001 From: bigbiff Date: Sat, 26 Feb 2022 18:45:55 -0500 Subject: [PATCH 4/4] A11: 3.6.1 release Change-Id: Iab1e839452af2507904796d094f8aed2d70bbc01 --- variables.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/variables.h b/variables.h index 8da69e94..661bb481 100755 --- a/variables.h +++ b/variables.h @@ -17,7 +17,7 @@ #ifndef _VARIABLES_HEADER_ #define _VARIABLES_HEADER_ -#define TW_MAIN_VERSION_STR "3.6.0_11" +#define TW_MAIN_VERSION_STR "3.6.1_11" #define TW_VERSION_STR TW_MAIN_VERSION_STR TW_DEVICE_VERSION #define TW_SETTINGS_FILE ".twrps" #define TW_RECOVERY_NAME "TWRP"