diff options
author | Alessio Balsini <balsini@google.com> | 2019-12-09 10:26:05 +0100 |
---|---|---|
committer | Alessio Balsini <balsini@google.com> | 2019-12-16 22:25:45 +0100 |
commit | a9665ced57ebd3f00f11cd8d9d99b33269687286 (patch) | |
tree | 74552b4a0de01c3f51c1a9e487a879ceda7499e2 /install | |
parent | Merge "minui: add ARGB_8888 format" (diff) | |
download | android_bootable_recovery-a9665ced57ebd3f00f11cd8d9d99b33269687286.tar android_bootable_recovery-a9665ced57ebd3f00f11cd8d9d99b33269687286.tar.gz android_bootable_recovery-a9665ced57ebd3f00f11cd8d9d99b33269687286.tar.bz2 android_bootable_recovery-a9665ced57ebd3f00f11cd8d9d99b33269687286.tar.lz android_bootable_recovery-a9665ced57ebd3f00f11cd8d9d99b33269687286.tar.xz android_bootable_recovery-a9665ced57ebd3f00f11cd8d9d99b33269687286.tar.zst android_bootable_recovery-a9665ced57ebd3f00f11cd8d9d99b33269687286.zip |
Diffstat (limited to '')
-rw-r--r-- | install/include/install/snapshot_utils.h | 9 | ||||
-rw-r--r-- | install/snapshot_utils.cpp | 25 |
2 files changed, 34 insertions, 0 deletions
diff --git a/install/include/install/snapshot_utils.h b/install/include/install/snapshot_utils.h index 00c3ef7e1..f4b978d2e 100644 --- a/install/include/install/snapshot_utils.h +++ b/install/include/install/snapshot_utils.h @@ -19,3 +19,12 @@ #include "recovery_ui/device.h" bool FinishPendingSnapshotMerges(Device* device); + +/* + * This function tries to create the snapshotted devices in the case a Virtual + * A/B device is updating. + * The function returns false in case of critical failure that would prevent + * the further mountings of devices, or true in case of success, if either the + * devices were created or there was no need to. + */ +bool CreateSnapshotPartitions(); diff --git a/install/snapshot_utils.cpp b/install/snapshot_utils.cpp index 69da5eea0..7235e67c8 100644 --- a/install/snapshot_utils.cpp +++ b/install/snapshot_utils.cpp @@ -15,6 +15,7 @@ * limitations under the License. */ +#include <android-base/logging.h> #include <android-base/properties.h> #include <libsnapshot/snapshot.h> @@ -22,6 +23,7 @@ #include "recovery_ui/ui.h" #include "recovery_utils/roots.h" +using android::snapshot::CreateResult; using android::snapshot::SnapshotManager; bool FinishPendingSnapshotMerges(Device* device) { @@ -47,3 +49,26 @@ bool FinishPendingSnapshotMerges(Device* device) { } return true; } + +bool CreateSnapshotPartitions() { + if (!android::base::GetBoolProperty("ro.virtual_ab.enabled", false)) { + // If the device does not support Virtual A/B, there's no need to create + // snapshot devices. + return true; + } + + auto sm = SnapshotManager::NewForFirstStageMount(); + if (!sm) { + // SnapshotManager could not be created. The device is still in a + // consistent state and can continue with the mounting of the existing + // devices, but cannot initialize snapshot devices. + LOG(WARNING) << "Could not create SnapshotManager"; + return true; + } + + auto ret = sm->RecoveryCreateSnapshotDevices(); + if (ret == CreateResult::ERROR) { + return false; + } + return true; +} |