Merge "Fix crash in mainline" am: 3a0d51f6b7
am: 6c5944f899
am: 9cd7fdc882
Change-Id: I13d6316005c1df1482f8426a25d672519873b4d1
This commit is contained in:
commit
06bd0c427f
1 changed files with 5 additions and 0 deletions
|
@ -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();
|
||||||
|
|
Loading…
Reference in a new issue