PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'TeamWin/android-11' into android-11

Browse Source 
Change-Id: Icdfe57679807de4dc8b8e3480946669d1e153b75
This commit is contained in:
Konsta
2022-03-16 17:50:56 +02:00
parent 9f3de1e955 4e406a053a
commit 3dfefcf5e8
4 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crypto/fscrypt/FsCrypt.cpp
+19 -9
View File
@@ -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()) {
partition.cpp
-2
View File
@@ -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);
prebuilt/Android.mk
+1 -1
View File
@@ -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
variables.h
+1 -1
View File
@@ -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"