commit | f670036b8213bf6ea48b31f9ae2c85b311a3f187 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Mon Dec 02 22:51:58 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Dec 02 22:51:58 2024 +0000 |
tree | 733cbfa5007375997791c66322e8f7141d5f520e | |
parent | be00d31ac55b3d19217b19f8dcec7dd0fa3cf6aa [diff] | |
parent | 326534aace6f05be2578e8c6abd4692efe9e2db0 [diff] |
Merge "libsnapshot: Cleanup temp metadata during rollback" into main am: 326534aace Original change: https://android-review.googlesource.com/c/platform/system/core/+/3388019 Change-Id: I49676341c3d86b8ad52c44dd2cc08653d0725b4a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/fs_mgr/libsnapshot/snapshot.cpp b/fs_mgr/libsnapshot/snapshot.cpp index acabd67..ecf567e 100644 --- a/fs_mgr/libsnapshot/snapshot.cpp +++ b/fs_mgr/libsnapshot/snapshot.cpp
@@ -2404,6 +2404,9 @@ PLOG(ERROR) << "Unable to write rollback indicator: " << path; } else { LOG(INFO) << "Rollback detected, writing rollback indicator to " << path; + if (device_->IsTempMetadata()) { + CleanupScratchOtaMetadataIfPresent(); + } } } LOG(INFO) << "Not booting from new slot. Will not mount snapshots.";