Merge "Fix crash in mainline"

This commit is contained in:
Treehugger Robot 2019-08-27 01:01:28 +00:00 committed by Gerrit Code Review
commit 3a0d51f6b7

View file

@ -263,6 +263,11 @@ bool cp_needsRollback() {
}
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();