From ebce8e6306b492afde96ed7a0757b62befcfd722 Mon Sep 17 00:00:00 2001
From: David Anderson <dvander@google.com>
Date: Thu, 4 Feb 2021 20:22:29 -0800
Subject: [PATCH] Fix SnapshotManager instantiation.

New() should be used instead of NewForFirstStageMount().

Bug: 168258606
Test: data wipe with VABC merge in progress
Change-Id: Idf2b01a504b577766da303091721764242e99a69
---
 install/snapshot_utils.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install/snapshot_utils.cpp b/install/snapshot_utils.cpp
index 7235e67c..336e50f8 100644
--- a/install/snapshot_utils.cpp
+++ b/install/snapshot_utils.cpp
@@ -32,7 +32,7 @@ bool FinishPendingSnapshotMerges(Device* device) {
   }
 
   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 @@ bool CreateSnapshotPartitions() {
     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