| commit | 832b61795668c35cff657eadde133547791ec28e | [log] [tgz] |
|---|---|---|
| author | Yifan Hong <elsk@google.com> | Mon Mar 16 12:31:16 2020 -0700 |
| committer | Yifan Hong <elsk@google.com> | Tue Mar 17 11:49:17 2020 -0700 |
| tree | 2002ff8ff0aca73e37edf624194ba039d2127cc1 | |
| parent | 3f35a8f4e4c48a812b48011cb1c4ff96c7cb597e [diff] |
Fix merge in sideload For UpdateAttempterAndroid: - In sideload, ApplyPayload is immediately called after UpdateAttempterAndroid::Init(), and errors out because ScheduleCleanupPreviousUpdate starts the ActionProcessor. Do not call it in sideload since ApplyPayload schedules a CleanupPreviousUpdateAction too. - Also fixes TerminateUpdateAndNotify in sideload if it errors at CleanupPreviousUpdateAction. For CleanupPreviousUpdateAction: - Don't wait for boot_completed and slot verification in sideload. - Ensure metadata is mounted. Fixes: 151640692 Test: sideload Change-Id: Ib91b208d3f8d79285b9a87a44410a575bd2da42e Merged-In: Ib91b208d3f8d79285b9a87a44410a575bd2da42e