diff options
| author | David Anderson <dvander@google.com> | 2019-10-31 18:02:41 -0700 |
|---|---|---|
| committer | David Anderson <dvander@google.com> | 2019-11-10 23:07:13 -0800 |
| commit | 220ddb1f0fb9d0e47f7c812c93da174ea3a8c037 (patch) | |
| tree | 9c863903a93eac39f0d1f800e9f5a86cd16e9d0d /fastboot/fastboot_driver.cpp | |
| parent | b58df7dac3b7d2f9aef8e2f3798ab2bd3b9969ed (diff) | |
fastbootd: Disallow certain operations during snapshot updates.
When a snapshot is applied or is merging, requests to erase or flash
userdata, metadata, or misc must be protected. In addition, the
set_active command must be restricted when a merge is in progress.
In addition, introduce a "snapshot-update merge" command for assisting
with erase requests when a merge is in progress. As in recovery, this
will force a merge to complete.
Bug: 139154945
Test: apply update
fastboot erase userdata
fastboot erase metadata
fastboot erase misc
fastboot set_active
Change-Id: I152446464335c62c39ffb4cc6366be9de19eac30
Diffstat (limited to 'fastboot/fastboot_driver.cpp')
| -rw-r--r-- | fastboot/fastboot_driver.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fastboot/fastboot_driver.cpp b/fastboot/fastboot_driver.cpp index 6a5ad206a..8d534ea32 100644 --- a/fastboot/fastboot_driver.cpp +++ b/fastboot/fastboot_driver.cpp @@ -124,8 +124,11 @@ RetCode FastBootDriver::SetActive(const std::string& slot, std::string* response RetCode FastBootDriver::SnapshotUpdateCommand(const std::string& command, std::string* response, std::vector<std::string>* info) { + prolog_(StringPrintf("Snapshot %s", command.c_str())); std::string raw = FB_CMD_SNAPSHOT_UPDATE ":" + command; - return RawCommand(raw, response, info); + auto result = RawCommand(raw, response, info); + epilog_(result); + return result; } RetCode FastBootDriver::FlashPartition(const std::string& partition, |