From 3126a113e7f45f54bb2475b1145a0467ae508308 Mon Sep 17 00:00:00 2001 From: Kjell Braden Date: Sun, 19 Jun 2016 16:58:15 +0000 Subject: wait for cryptfs device node to come up this is to prevent a race condition to occur when mounting an adopted storage volume just after it was decrypted. After setting up the decrypted volume using cryptfs_setup_ext_volume(), Decrypt_Adopted() immediately calls Mount(), which will call Check_FS_Type(), which will fail in blkid_new_probe_from_filename, as the device node was not created yet. Change-Id: Ic5a274c2066ab278c9b7f1c8b83b820e552ca344 --- partitions.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'partitions.hpp') diff --git a/partitions.hpp b/partitions.hpp index fc600213c..7416fbe4c 100644 --- a/partitions.hpp +++ b/partitions.hpp @@ -165,7 +165,7 @@ private: bool Make_Dir(string Path, bool Display_Error); // Creates a directory if it doesn't already exist bool Find_MTD_Block_Device(string MTD_Name); // Finds the mtd block device based on the name from the fstab void Recreate_AndSec_Folder(void); // Recreates the .android_secure folder - void Mount_Storage_Retry(void); // Tries multiple times with a half second delay to mount a device in case storage is slow to mount + bool Mount_Storage_Retry(bool Display_Error); // Tries multiple times with a half second delay to mount a device in case storage is slow to mount bool Is_Sparse_Image(const string& Filename); // Determines if a file is in sparse image format bool Flash_Sparse_Image(const string& Filename); // Flashes a sparse image using simg2img bool Flash_Image_FI(const string& Filename, ProgressTracking *progress); // Flashes an image to the partition using flash_image for mtd nand -- cgit v1.2.3