commit 9cd7fdc8829ded0eb45e5f35d01eebaf7c700b59
author Paul Lawrence <paullawrence@google.com> Mon Aug 26 18:54:15 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Aug 26 18:54:15 2019 -0700
tree 057c5636f298b3aef08177c418805fe279525177
parent 86bc2a32d83db2edfa2ce050b6593f0bb2c00d10
parent 6c5944f899cfaa6c439637e0d456c9acd07c7485

Merge "Fix crash in mainline" am: 3a0d51f6b7
am: 6c5944f899

Change-Id: I2d40676c59d364c02154bced41e6ce818b5d4886

Checkpoint.cpp

diff --git a/Checkpoint.cpp b/Checkpoint.cpp
index a2db4bd..e5ef4a2 100644
--- a/Checkpoint.cpp
+++ b/Checkpoint.cpp
@@ -263,6 +263,11 @@
 }
 
 bool cp_needsCheckpoint() {
+    // Make sure we only return true during boot. See b/138952436 for discussion
+    static bool called_once = false;
+    if (called_once) return isCheckpointing;
+    called_once = true;
+
     bool ret;
     std::string content;
     sp<IBootControl> module = IBootControl::getService();