tree 21f47da3500b475d522d9a8d958dd626a668edf3
parent 4f611563370df96912a7ea018291c5d7b10d5548
author Yifan Hong <elsk@google.com> 1579196236 -0800
committer Yifan Hong <elsk@google.com> 1579662792 +0000

update_engine_client_android implement --merge

This flag corresponds to cleanupSuccessfulUpdate function
of IUpdateEngine. It waits until merge completes or fails.

Note that this doesn't initiate a merge if one has not been
started. To initiate a merge, use snapshotctl.

Test: use it without OTA, it exits immediately
Test: use it after applying update before reboot, it exits immediately
   (however, it cancels the update. See b/147819418)
Test: use it after rebooting into new update, it waits until merge
completes.

Bug: 138808328

Change-Id: Id61c21811f2c33397246035788d139b059208b7f