From 1b190166eb1295c6339f6100e4fbb92c81b81ea6 Mon Sep 17 00:00:00 2001 From: Ethan Yonker Date: Mon, 5 Dec 2016 15:25:19 -0600 Subject: Add boot slot support Change-Id: I7eaf80e327985f53791f90fbdebad022a9650d31 --- partitions.hpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'partitions.hpp') diff --git a/partitions.hpp b/partitions.hpp index 3f2e40a5d..a6af5b1a4 100644 --- a/partitions.hpp +++ b/partitions.hpp @@ -133,7 +133,7 @@ private: bool Is_File_System(string File_System); // Checks to see if the file system given is considered a file system bool Is_Image(string File_System); // Checks to see if the file system given is considered an image void Setup_File_System(bool Display_Error); // Sets defaults for a file system partition - void Setup_Image(bool Display_Error); // Sets defaults for an image partition + void Setup_Image(); // Sets defaults for an image partition void Setup_AndSec(void); // Sets up .android_secure settings void Find_Real_Block_Device(string& Block_Device, bool Display_Error); // Checks the block device given and follows symlinks until it gets to the real block device unsigned long long IOCTL_Get_Block_Size(); // Finds the partition size using ioctl @@ -215,8 +215,9 @@ private: bool Can_Flash_Img; // Indicates if this partition can have images flashed to it via the GUI bool Mount_Read_Only; // Only mount this partition as read-only bool Is_Adopted_Storage; // Indicates that this partition is for adopted storage (android_expand) - TWExclude backup_exclusions; - TWExclude wipe_exclusions; + bool SlotSelect; // Partition has A/B slots + TWExclude backup_exclusions; // Exclusions for file based backups + TWExclude wipe_exclusions; // Exclusions for file based wipes (data/media devices only) friend class TWPartitionManager; friend class DataManager; @@ -289,6 +290,9 @@ public: bool Flash_Image(string& path, string& filename); // Flashes an image to a selected partition from the partition list bool Restore_Partition(struct PartitionSettings *part_settings); // Restore the partitions based on type TWAtomicInt stop_backup; + void Set_Active_Slot(const string& Slot); // Sets the active slot to A or B + string Get_Active_Slot_Suffix(); // Returns active slot _a or _b + string Get_Active_Slot_Display(); // Returns active slot A or B for display purposes private: void Setup_Settings_Storage_Partition(TWPartition* Part); // Sets up settings storage @@ -308,6 +312,7 @@ private: private: std::vector Partitions; // Vector list of all partitions + string Active_Slot_Display; // Current Active Slot (A or B) for display purposes }; extern TWPartitionManager PartitionManager; -- cgit v1.2.3