diff options
| author | mauronofrio <poronofrio@gmail.com> | 2019-11-23 22:27:34 +0100 |
|---|---|---|
| committer | mauronofrio <poronofrio@gmail.com> | 2019-11-23 22:29:15 +0100 |
| commit | 9bf73351e50325f4f892d7af222953cfa754f223 (patch) | |
| tree | 9cb4dd68828987d77482221732d0cc7a590170b0 | |
| parent | Merge "Add ld.config.txt for Android 8.x+ trees" into android-9.0 (diff) | |
| download | android_bootable_recovery-9bf73351e50325f4f892d7af222953cfa754f223.tar android_bootable_recovery-9bf73351e50325f4f892d7af222953cfa754f223.tar.gz android_bootable_recovery-9bf73351e50325f4f892d7af222953cfa754f223.tar.bz2 android_bootable_recovery-9bf73351e50325f4f892d7af222953cfa754f223.tar.lz android_bootable_recovery-9bf73351e50325f4f892d7af222953cfa754f223.tar.xz android_bootable_recovery-9bf73351e50325f4f892d7af222953cfa754f223.tar.zst android_bootable_recovery-9bf73351e50325f4f892d7af222953cfa754f223.zip | |
| -rw-r--r-- | partition.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/partition.cpp b/partition.cpp index 5d4e61dc0..aa82c09ec 100644 --- a/partition.cpp +++ b/partition.cpp @@ -662,7 +662,14 @@ void TWPartition::Setup_Data_Partition(bool Display_Error) { LOGERR("Primary block device '%s' for mount point '%s' is not present!\n", Primary_Block_Device.c_str(), Mount_Point.c_str()); } } else { - Decrypt_FBE_DE(); + + if (!Decrypt_FBE_DE()) { + LOGINFO("Trying wrapped key.\n"); + property_set("fbe.data.wrappedkey", "true"); + if (!Decrypt_FBE_DE()) { + LOGERR("Unable to decrypt FBE device\n"); + } + } } if (datamedia && (!Is_Encrypted || (Is_Encrypted && Is_Decrypted))) { Setup_Data_Media(); |