MultiROM: Fix NO_KEXEC primary_boot.img restore on encrypted devices

Change-Id: I88d3047d56d5671b0836b0119cfa929761921fde
This commit is contained in:
nkk71
2016-10-10 17:11:09 +03:00
parent 7f0b128769
commit 6c3bc29080

View File

@@ -326,6 +326,13 @@ int main(int argc, char **argv) {
}
}
#ifdef TARGET_RECOVERY_IS_MULTIROM
#ifdef MR_NO_KEXEC
// if /data in encrypted, the previous call would have done nothing, so check after decryption again
MultiROM::nokexec_restore_primary_and_cleanup();
#endif
#endif //TARGET_RECOVERY_IS_MULTIROM
// Read the settings file
#ifdef TW_HAS_MTP
// We unmount partitions sometimes during early boot which may override