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

Commit 88a0f6ed authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix SnapshotManager instantiation." am: bc1165ed 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2edb114694d02699c3809285349eecf3d41e9df3
parents f0e8422f bc1165ed

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