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

am: 9cd7fdc882

Change-Id: I13d6316005c1df1482f8426a25d672519873b4d1
This commit is contained in:
Paul Lawrence 2019-08-26 19:23:40 -07:00 committed by android-build-merger
commit 06bd0c427f

View file

@ -263,6 +263,11 @@ bool cp_needsRollback() {
} }
bool cp_needsCheckpoint() { 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; bool ret;
std::string content; std::string content;
sp<IBootControl> module = IBootControl::getService(); sp<IBootControl> module = IBootControl::getService();