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: Id1d534cce0969c98e2b8b6484278342201dd562d
This commit is contained in:
Konsta
2022-01-12 16:55:24 +02:00
parent 88d598c8c3 e331b8a1b7
commit 438a85efcf
27 changed files with 215 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
partition.cpp
View File

@@ -736,7 +736,6 @@ void TWPartition::Set_FBE_Status() {
bool TWPartition::Decrypt_FBE_DE() {
if (TWFunc::Path_Exists("/data/unencrypted/key/version")) {
DataManager::SetValue(TW_IS_FBE, 1);
DataManager::SetValue(TW_CRYPTO_PWTYPE, "0"); // Set initial value so that recovery will not be confused when using unencrypted data or failed to decrypt data
PartitionManager.Set_Crypto_State();
PartitionManager.Set_Crypto_Type("file");
LOGINFO("File Based Encryption is present\n");
@@ -1605,7 +1604,7 @@ bool TWPartition::Mount(bool Display_Error) {
if (Removable)
Update_Size(Display_Error);
if (!Symlink_Mount_Point.empty()) {
if (!Symlink_Mount_Point.empty() && Symlink_Mount_Point != "/sdcard") {
if (!Bind_Mount(false))
return false;
}