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: Iea27f17b22ef4556935f17e95bca93cbadfffe33
This commit is contained in:
Konsta
2023-10-31 10:03:21 +02:00
parent d5d9f9b881 8bd48201c3
commit 31f02fc930
5 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
partition.cpp
+12 -1
View File
@@ -668,6 +668,10 @@ void TWPartition::Setup_Data_Partition(bool Display_Error) {
UnMount(false);
#ifdef TW_INCLUDE_CRYPTO
#ifdef TW_PREPARE_DATA_MEDIA_EARLY
if (datamedia)
Setup_Data_Media();
#endif
Can_Be_Encrypted = true;
char crypto_blkdev[255];
property_get("ro.crypto.fs_crypto_blkdev", crypto_blkdev, "error");
@@ -675,8 +679,10 @@ void TWPartition::Setup_Data_Partition(bool Display_Error) {
Set_FBE_Status();
Decrypted_Block_Device = crypto_blkdev;
LOGINFO("Data already decrypted, new block device: '%s'\n", crypto_blkdev);
#ifndef TW_PREPARE_DATA_MEDIA_EARLY
if (datamedia)
Setup_Data_Media();
#endif
DataManager::SetValue(TW_IS_ENCRYPTED, 0);
} else if (!Mount(false)) {
if (Is_Present) {
@@ -719,9 +725,10 @@ void TWPartition::Setup_Data_Partition(bool Display_Error) {
LOGERR("Unable to decrypt FBE device\n");
} else {
DataManager::SetValue(TW_IS_ENCRYPTED, 0);
#ifndef TW_PREPARE_DATA_MEDIA_EARLY
if (datamedia)
Setup_Data_Media();
#endif
}
}
if (datamedia && (!Is_Encrypted || (Is_Encrypted && Is_Decrypted))) {
@@ -1234,8 +1241,12 @@ void TWPartition::Setup_Data_Media() {
Make_Dir("/sdcard", false);
Symlink_Mount_Point = "/sdcard";
}
#ifdef TW_PREPARE_DATA_MEDIA_EARLY
if (Mount(false) && TWFunc::Path_Exists(Mount_Point + "/media/0")) {
#else
Mount(false);
if (TWFunc::Path_Exists(Mount_Point + "/media/0")) {
#endif
Storage_Path = Mount_Point + "/media/0";
Symlink_Path = Storage_Path;
DataManager::SetValue(TW_INTERNAL_PATH, Mount_Point + "/media/0");