Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75626f2c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix SnapshotManager instantiation." am: bc1165ed am: 88a0f6ed am: 36d5558c 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib8ed0c1ff5d5cc4247cf06222a3465a38d1dc0a9
parents 186e8fd9 36d5558c

install/snapshot_utils.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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