merges: allow user to perform snapshot merges in advanced menu
Change-Id: I894a0ef5a0ec8e208053358f09a6b8a6d4ee408a
diff --git a/partitions.hpp b/partitions.hpp
index 4d432c3..8054734 100755
--- a/partitions.hpp
+++ b/partitions.hpp
@@ -178,7 +178,6 @@
bool Has_Data_Media; // Indicates presence of /data/media, may affect wiping and backup methods
void Setup_Data_Media(); // Sets up a partition as a /data/media emulated storage partition
void Set_Block_Device(std::string block_device); // Allow super partition setup to change block device
- bool Check_Pending_Merges(); // Check and run pending merges on data for VAB devices
private:
bool Process_Fstab_Line(const char *fstab_line, bool Display_Error, std::map<string, Flags_Map> *twrp_flags); // Processes a fstab line
@@ -404,6 +403,7 @@
int Set_FDE_Encrypt_Status(); // Sets encryption state for FDE devices (ro.crypto.state and ro.crypto.type)
void Unlock_Block_Partitions(); // Unlock all block devices after update_engine runs
bool Unmap_Super_Devices(); // Unmap super devices in TWRP
+ bool Check_Pending_Merges(); // Check and run pending merges on data for VAB devices
private:
void Setup_Settings_Storage_Partition(TWPartition* Part); // Sets up settings storage