| Revisión | 08e6ac30c7a7b3ad4d5f666047569753e8309a48 (tree) |
|---|---|
| Tiempo | 2019-09-22 08:10:35 |
| Autor | android-build-team Robot <android-build-team-robot@goog...> |
| Commiter | android-build-team Robot |
Snap for 5892339 from 1b535e41fd6c1b666cf806aae782cf621b7782bc to qt-qpr1-release
Change-Id: Ibb3cf7ec9163d5870c6b51d8d14bdf4985b63feb
Checkpoint.cpp (diff)| @@ -244,6 +244,11 @@ bool cp_needsRollback() { | ||
| 244 | 244 | } |
| 245 | 245 | |
| 246 | 246 | bool cp_needsCheckpoint() { |
| 247 | + // Make sure we only return true during boot. See b/138952436 for discussion | |
| 248 | + static bool called_once = false; | |
| 249 | + if (called_once) return isCheckpointing; | |
| 250 | + called_once = true; | |
| 251 | + | |
| 247 | 252 | bool ret; |
| 248 | 253 | std::string content; |
| 249 | 254 | sp<IBootControl> module = IBootControl::getService(); |
| @@ -317,6 +322,8 @@ static void cp_healthDaemon(std::string mnt_pnt, std::string blk_device, bool is | ||
| 317 | 322 | } // namespace |
| 318 | 323 | |
| 319 | 324 | Status cp_prepareCheckpoint() { |
| 325 | + // Log to notify CTS - see b/137924328 for context | |
| 326 | + LOG(INFO) << "cp_prepareCheckpoint called"; | |
| 320 | 327 | if (!isCheckpointing) { |
| 321 | 328 | return Status::ok(); |
| 322 | 329 | } |
Android-x86
Fork