commit 6a6aeca07584f0af892be0d7c361f78e0a7a60c0
author Treehugger Robot <treehugger-gerrit@google.com> Mon Feb 08 23:57:46 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Feb 08 23:57:46 2021 +0000
tree 07d6d64875845e8c129b651400acc82c7be1502e
parent 78235c1c5a817adf6d7336f0b2e13d4dfc05f96f
parent 75626f2cd39c3599a177eb7d9b1b04c0d57f5a6b

Merge "Fix SnapshotManager instantiation." am: bc1165edbc am: 88a0f6edaa am: 36d5558ce0 am: 75626f2cd3

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1576377

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1d4de4e62f4ccd8f44ffba3d219f84317173674d

install/snapshot_utils.cpp

diff --git a/install/snapshot_utils.cpp b/install/snapshot_utils.cpp
index 7235e67..336e50f 100644
--- a/install/snapshot_utils.cpp
+++ b/install/snapshot_utils.cpp
@@ -32,7 +32,7 @@
   }
 
   RecoveryUI* ui = device->GetUI();
-  auto sm = SnapshotManager::NewForFirstStageMount();
+  auto sm = SnapshotManager::New();
   if (!sm) {
     ui->Print("Could not create SnapshotManager.\n");
     return false;
@@ -57,7 +57,7 @@
     return true;
   }
 
-  auto sm = SnapshotManager::NewForFirstStageMount();
+  auto sm = SnapshotManager::New();
   if (!sm) {
     // SnapshotManager could not be created. The device is still in a
     // consistent state and can continue with the mounting of the existing