commit 06bd0c427f3bf0a0589341f419dab946b6a38752
author Paul Lawrence <paullawrence@google.com> Mon Aug 26 19:23:40 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Aug 26 19:23:40 2019 -0700
tree 053b953cdf3874165c494adb30c924b86589962a
parent 466c1c07ddb04e267d11fdad83e09830b1844e7a
parent 9cd7fdc8829ded0eb45e5f35d01eebaf7c700b59

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

Change-Id: I13d6316005c1df1482f8426a25d672519873b4d1

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();