commit 84203c1e245b471950b8bd7c6f4e9a9bb3059dba
author Daniel Rosenberg <drosen@google.com> Tue Mar 19 14:02:59 2019 -0700
committer Daniel Rosenberg <drosen@google.com> Thu Mar 21 13:33:49 2019 -0700
tree 2aa76a24104fd59dc7b8f3c1c1c3fdfaf41fee94
parent a41b7849d0f01b0ce8ca9d5bdef909c6d43071b4

Make needsCheckpoint cover whole session

This makes needCheckpoint return true when the device will or is using
checkpointing.

Test: vdc checkpoint startCheckpoint 1
      reboot
      vdc checkpoint needsCheckpoint
      should return 1 before and after data mounts, and 0 once the
      checkpoint has been committed

Change-Id: Ib57f4461d837f41a8110ed318168165a684d913a

Checkpoint.cpp

diff --git a/Checkpoint.cpp b/Checkpoint.cpp
index f96ca39..30d88ae 100644
--- a/Checkpoint.cpp
+++ b/Checkpoint.cpp
@@ -212,6 +212,8 @@
     std::string content;
     sp<IBootControl> module = IBootControl::getService();
 
+    if (isCheckpointing) return isCheckpointing;
+
     if (module && module->isSlotMarkedSuccessful(module->getCurrentSlot()) == BoolResult::FALSE) {
         isCheckpointing = true;
         return true;