commit 226942bc35b0b62cabd46b8213c2bebf3dc2ebf6
author Yifan Hong <elsk@google.com> Thu Oct 24 15:39:09 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Oct 24 15:39:09 2019 -0700
tree 7f929b96ebe5939e0946ef0acb9a6e4a38a2a37f
parent 527aed705800b3cef51de65f8d458ea456ee2803
parent 5d8a4394cb45ecc53fb0f42fd51d3c3810b2dd57

Merge "libsnapshot: Only EnsureImageManager when it is needed." am: 81a0738c68 am: 3d613876e9 am: d6b3f087e3
am: 7e73b2c027

Change-Id: Ie1ca554876943333cdef1bd12d9e947fb98c2fad

fs_mgr/libsnapshot/snapshot.cpp

diff --git a/fs_mgr/libsnapshot/snapshot.cpp b/fs_mgr/libsnapshot/snapshot.cpp
index 2c5eed1..758f69b 100644
--- a/fs_mgr/libsnapshot/snapshot.cpp
+++ b/fs_mgr/libsnapshot/snapshot.cpp
@@ -342,7 +342,6 @@
                                   const std::chrono::milliseconds& timeout_ms,
                                   std::string* dev_path) {
     CHECK(lock);
-    if (!EnsureImageManager()) return false;
 
     SnapshotStatus status;
     if (!ReadSnapshotStatus(lock, name, &status)) {
@@ -1428,7 +1427,6 @@
                                     const SnapshotStatus& snapshot_status,
                                     AutoDeviceList* created_devices, std::string* cow_name) {
     CHECK(lock);
-    if (!EnsureImageManager()) return false;
     CHECK(snapshot_status.cow_partition_size() + snapshot_status.cow_file_size() > 0);
     auto begin = std::chrono::steady_clock::now();
 
@@ -1440,6 +1438,7 @@
 
     // Map COW image if necessary.
     if (snapshot_status.cow_file_size() > 0) {
+        if (!EnsureImageManager()) return false;
         auto remaining_time = GetRemainingTime(params.timeout_ms, begin);
         if (remaining_time.count() < 0) return false;