6bfc75a300
Merge "minui/drm: wait for page flip completion" am: d419966730 am: d3e023c265
...
am: cb482213b4
2018-07-03 19:14:03 -07:00
cb482213b4
Merge "minui/drm: wait for page flip completion" am: d419966730
...
am: d3e023c265
2018-07-03 19:10:03 -07:00
d3e023c265
Merge "minui/drm: wait for page flip completion"
...
am: d419966730
2018-07-03 19:06:01 -07:00
d419966730
Merge "minui/drm: wait for page flip completion"
2018-07-04 01:57:44 +00:00
5e79224474
Merge "No longer print hash for stashed blocks during verification of retry" am: 0a84d7260b am: 65419746cb
...
am: db33eeeacc
2018-07-03 13:45:24 -07:00
db33eeeacc
Merge "No longer print hash for stashed blocks during verification of retry" am: 0a84d7260b
...
am: 65419746cb
2018-07-03 13:41:22 -07:00
65419746cb
Merge "No longer print hash for stashed blocks during verification of retry"
...
am: 0a84d7260b
2018-07-03 13:36:21 -07:00
0a84d7260b
Merge "No longer print hash for stashed blocks during verification of retry"
2018-07-03 20:22:40 +00:00
955da1e26d
minui/drm: wait for page flip completion
...
If two consecutive call are made to drmModePageFlip, the second call
may fail with -EBUSY because the first flip is not completed yet.
This patch adds a wait for completion mechanism based on
drmHandleEvent.
Change-Id: Ied13ebefc7523003431b1b307bae70d1a70cb24b
Signed-off-by: Jeremy Compostella <jeremy.compostella@intel.com >
Signed-off-by: Benoit Fradin <benoit.fradin@intel.com >
2018-07-03 17:43:06 +00:00
3c5958f62d
No longer print hash for stashed blocks during verification of retry
...
During block verification, load stash reads from the source blocks on
the device instead of the stashed files. And for interrupted update,
it's pretty common that the source blocks has already been overwritten
by subsequent commands.
In that case the hash printing is mostly useless. Moreover we should have
already printed the hash when the first update failed.
Bug: 80241799
Test: Unit tests pass. No longer prints mismatching stashed source blocks on retry.
Change-Id: I4effe684280b0325199f6cc4b2cc26e91295c2d7
2018-07-02 16:42:09 -07:00
c3701ea992
Merge "updater: Check the number of args in Command::Parse." am: 95b8d2b064 am: 42f96e5516
...
am: 33cfd108ca
2018-06-25 20:49:16 -07:00
33cfd108ca
Merge "updater: Check the number of args in Command::Parse." am: 95b8d2b064
...
am: 42f96e5516
2018-06-25 20:46:12 -07:00
c8f11d9c20
Merge "updater: Add Command parsing codes." am: afc2962e60 am: e6604307f6
...
am: 28811678ef
2018-06-25 20:42:04 -07:00
42f96e5516
Merge "updater: Check the number of args in Command::Parse."
...
am: 95b8d2b064
2018-06-25 20:42:01 -07:00
28811678ef
Merge "updater: Add Command parsing codes." am: afc2962e60
...
am: e6604307f6
2018-06-25 20:39:11 -07:00
95b8d2b064
Merge "updater: Check the number of args in Command::Parse."
2018-06-26 03:37:03 +00:00
e6604307f6
Merge "updater: Add Command parsing codes."
...
am: afc2962e60
2018-06-25 20:36:08 -07:00
afc2962e60
Merge "updater: Add Command parsing codes."
2018-06-26 03:30:52 +00:00
92f339372c
updater: Check the number of args in Command::Parse.
...
Additionally checks for excess args when parsing ERASE, FREE, NEW, STASH
and ZERO. Note that the check for MOVE, BSDIFF, IMGDIFF has been covered
in Command::ParseTargetInfoAndSourceInfo.
Test: Run recovery_unit_test on marlin.
Change-Id: Ic8bc9b7a8dcf98f1f8db2e259607564508726857
2018-06-25 13:39:33 -07:00
6a7e4af7c6
updater: Add Command parsing codes.
...
The added codes are not used in the updater yet. The switch will happen
in subsequent CLs.
Test: Run recovery_unit_test and recovery_component_test on marlin.
Change-Id: I1ae8a233280f02c2171b43ef028bdccdacb39c59
2018-06-25 13:39:29 -07:00
a9be0c16f3
Merge "applypatch: {Load,Save}FileContents and ParseSha1 take std::string." am: b4181566f9 am: 839c40513a
...
am: d9f532e7a2
2018-06-25 07:51:45 -07:00
d9f532e7a2
Merge "applypatch: {Load,Save}FileContents and ParseSha1 take std::string." am: b4181566f9
...
am: 839c40513a
2018-06-25 07:47:41 -07:00
839c40513a
Merge "applypatch: {Load,Save}FileContents and ParseSha1 take std::string."
...
am: b4181566f9
2018-06-25 07:44:17 -07:00
b4181566f9
Merge "applypatch: {Load,Save}FileContents and ParseSha1 take std::string."
2018-06-25 14:35:03 +00:00
b8cb76e380
Merge "applypatch: Move to libbase logging." am: bd76709827 am: 513c7fb9e0
...
am: 2141a760cc
2018-06-24 11:02:57 -07:00
2141a760cc
Merge "applypatch: Move to libbase logging." am: bd76709827
...
am: 513c7fb9e0
2018-06-24 10:59:37 -07:00
513c7fb9e0
Merge "applypatch: Move to libbase logging."
...
am: bd76709827
2018-06-24 10:56:16 -07:00
bd76709827
Merge "applypatch: Move to libbase logging."
2018-06-24 17:47:21 +00:00
8c3a35f9f8
Merge "e2fsdroid and mke2fs are dynamic executable in recovery partition" am: 9b5d4ea20f am: 681ae40d41
...
am: 4a9c02ed3a
2018-06-20 15:35:04 -07:00
4a9c02ed3a
Merge "e2fsdroid and mke2fs are dynamic executable in recovery partition" am: 9b5d4ea20f
...
am: 681ae40d41
2018-06-20 15:30:03 -07:00
681ae40d41
Merge "e2fsdroid and mke2fs are dynamic executable in recovery partition"
...
am: 9b5d4ea20f
2018-06-20 15:24:29 -07:00
9b5d4ea20f
Merge "e2fsdroid and mke2fs are dynamic executable in recovery partition"
2018-06-20 22:16:21 +00:00
8dc704930b
applypatch: {Load,Save}FileContents and ParseSha1 take std::string.
...
Test: mmma -j bootable/recovery
Test: Run recovery_component_test on marlin.
Change-Id: Ifcf244346a88dac833d91b169a4c2aee1fe677f1
2018-06-20 13:21:16 -07:00
859bfc5659
applypatch: Move to libbase logging.
...
Test: mmma -j bootable/recovery
Test: Run recovery_component_test on marlin.
Change-Id: I3a4e32eb2c1e231c6690a50571edc66341b8d50a
2018-06-20 13:19:25 -07:00
0120ad8f3a
Merge "applypatch: Clean up the function comments." am: 24e1321bc3 am: d4c1045d4e
...
am: 8d1ba1d939
2018-06-20 09:36:57 -07:00
ec24c670c3
Merge "updater: Defer the creation of the new data writer." am: ddc81680e6 am: ae3e472a43
...
am: ba98704a01
2018-06-20 09:36:22 -07:00
8d1ba1d939
Merge "applypatch: Clean up the function comments." am: 24e1321bc3
...
am: d4c1045d4e
2018-06-20 09:32:38 -07:00
ba98704a01
Merge "updater: Defer the creation of the new data writer." am: ddc81680e6
...
am: ae3e472a43
2018-06-20 09:32:19 -07:00
d4c1045d4e
Merge "applypatch: Clean up the function comments."
...
am: 24e1321bc3
2018-06-20 09:28:39 -07:00
ae3e472a43
Merge "updater: Defer the creation of the new data writer."
...
am: ddc81680e6
2018-06-20 09:28:19 -07:00
24e1321bc3
Merge "applypatch: Clean up the function comments."
2018-06-20 16:26:02 +00:00
ddc81680e6
Merge "updater: Defer the creation of the new data writer."
2018-06-20 16:20:46 +00:00
69364fe553
e2fsdroid and mke2fs are dynamic executable in recovery partition
...
The two utilities are now converted to dynamic executables as shared
libraries are supported in recovery mode.
As part of the conversion, their location has moved from /sbin to
/system/bin. Reflect the change in the program 'recovery'
Bug: 79146551
Test: adb reboot recovery, and select 'Wipe data/factory reset'. The
data partition is formatted and there is no selinux denial.
Change-Id: Ie7cfc4c50ab1e6767e4a5170533ccf826ec7d7f3
2018-06-20 14:24:05 +09:00
0c05f3af2f
Merge "updater_sample: add privileged system app docs" am: 4a2c2d8102 am: 9b4d364409
...
am: 00c7308d92
2018-06-19 19:23:28 -07:00
00c7308d92
Merge "updater_sample: add privileged system app docs" am: 4a2c2d8102
...
am: 9b4d364409
2018-06-19 19:19:24 -07:00
9b4d364409
Merge "updater_sample: add privileged system app docs"
...
am: 4a2c2d8102
2018-06-19 19:14:52 -07:00
4a2c2d8102
Merge "updater_sample: add privileged system app docs"
2018-06-20 02:05:50 +00:00
155771bafa
applypatch: Clean up the function comments.
...
Also two minor changes (other than renaming some parameters):
- Added constness to the first parameter of FindMatchingPatch();
- Declared WriteToPartition() as static.
Bug: 110106408
Test: mmma -j bootable/recovery
Change-Id: I388958c944a23ce4a38a757ce2249f6a89dd4f03
2018-06-19 16:33:50 -07:00
0e629378cd
Merge "Drop the dependency on AB_OTA_UPDATER flag." am: 9fb0d89583 am: a855c33880
...
am: 63cc0a7ff9
2018-06-19 13:11:01 -07:00
63cc0a7ff9
Merge "Drop the dependency on AB_OTA_UPDATER flag." am: 9fb0d89583
...
am: a855c33880
2018-06-19 13:08:37 -07:00
Jeremy Compostella
Treehugger Robot
Tianjie Xu
Tao Bao
Jiyong Park
Zhomart Mukhamejanov