1b30b73c4b
Merge "updater_sample: improve updater state handling" am: 269be9f22d am: 188190cc8c
...
am: ca9d2d71bf
2018-06-04 18:23:38 -07:00
ca9d2d71bf
Merge "updater_sample: improve updater state handling" am: 269be9f22d
...
am: 188190cc8c
2018-06-04 17:37:30 -07:00
0ac309bfcb
Merge "tests: Add ResumableUpdaterTest." am: a21a63bf56 am: 1d33962b86
...
am: 98dc45f0f0
2018-06-04 17:10:18 -07:00
188190cc8c
Merge "updater_sample: improve updater state handling"
...
am: 269be9f22d
2018-06-04 17:05:59 -07:00
98dc45f0f0
Merge "tests: Add ResumableUpdaterTest." am: a21a63bf56
...
am: 1d33962b86
2018-06-04 16:31:37 -07:00
269be9f22d
Merge "updater_sample: improve updater state handling"
2018-06-04 23:18:43 +00:00
469b35a457
updater_sample: improve updater state handling
...
- Enable more UpdaterState transitions.
- MainActivity: Improve UI states.
- UpdateManager: fix status handling errors, add
suspend/resume methods.
Add "synchronize this" to public control (suspend, cancel, ..)
methods.
- Add several UpdateManager tests.
Test: on device
Test: JUnit4
Change-Id: Id7f85dfaa466fa0d6136eee39e9fd7658278c616
Signed-off-by: Zhomart Mukhamejanov <zhomart@google.com >
2018-06-04 14:23:37 -07:00
1d33962b86
Merge "tests: Add ResumableUpdaterTest."
...
am: a21a63bf56
2018-06-04 14:16:05 -07:00
a21a63bf56
Merge "tests: Add ResumableUpdaterTest."
2018-06-04 19:25:21 +00:00
c0299edd46
tests: Add ResumableUpdaterTest.
...
This is a stress test that instantiates multiple testcases that
interrupt a BBOTA update at every transfer command. Each testcase
asserts the last_command_file after the interruption, verifies the
update resumability, then resumes the update and asserts the updated
image.
The transfer list in the testcase covers most of the transfer commands
(stash/free/move/bsdiff/zero/new), as well as some special pattern like
having duplicate stash ids.
This CL also addresses one issue in the updater code, by resetting the
stash_map before each run. The stash map should be valid only per
block_image_verify/block_image_update run. Having leftover may cause
issue in subsequent runs, in particular when calling block_image_verify
after a previous run of block_image_{update,verify}.
Test: Run recovery_component_test on marlin.
Change-Id: I6f9a0368d194a754ce41a9c9819c6d5be2657248
2018-06-04 16:19:45 +00:00
92824456bd
Merge "updater_sample: validate state only once" am: 02ee7bf29d am: 8bb3085865
...
am: a64639f104
2018-06-01 12:13:40 -07:00
a64639f104
Merge "updater_sample: validate state only once" am: 02ee7bf29d
...
am: 8bb3085865
2018-06-01 12:08:09 -07:00
8bb3085865
Merge "updater_sample: validate state only once"
...
am: 02ee7bf29d
2018-06-01 12:03:06 -07:00
02ee7bf29d
Merge "updater_sample: validate state only once"
2018-06-01 18:52:37 +00:00
8a7861c617
Merge "Let gr_init proceed even if we failed to load a font file" am: 2d85a0f6f7 am: 80918c9773
...
am: 381fa3a7db
2018-06-01 06:51:49 -07:00
381fa3a7db
Merge "Let gr_init proceed even if we failed to load a font file" am: 2d85a0f6f7
...
am: 80918c9773
2018-06-01 05:33:28 -07:00
80918c9773
Merge "Let gr_init proceed even if we failed to load a font file"
...
am: 2d85a0f6f7
2018-06-01 03:14:54 -07:00
2d85a0f6f7
Merge "Let gr_init proceed even if we failed to load a font file"
2018-06-01 06:27:30 +00:00
f5f2d8cc13
Merge "recovery: add --fsck_unshare_blocks option for adb remount" am: bda4495176 am: b0d9b3594b
...
am: 5a78f3984f
2018-05-31 22:47:22 -07:00
8826150c9e
Merge "updater_sample: Add @GuardedBy" am: 2759733136 am: a37a085a11
...
am: 7d5746309b
2018-05-31 22:46:56 -07:00
29668f02dc
Merge "updater_sample: Improve update completion handling" am: 9455173f87 am: 86f05074d2
...
am: 3bb7b616a3
2018-05-31 22:45:46 -07:00
d9b4d47ba3
Merge "updater: Drop the 'blocks' parameter in LoadStash()." am: 0b80ba14d7 am: 838f30a8f7
...
am: 8d6905d952
2018-05-31 22:26:19 -07:00
842f2a3dca
Let gr_init proceed even if we failed to load a font file
...
Some users of minui don't need to draw texts; and we should let them
still be able to use the library without providing a font file. Also add
check for null pointers in gr_measure() and gr_font_size().
Bug: 80535212
Test: boot into recovery without a font file, and the buttons still work
Change-Id: I848e4410f2ce09ea0ab433573e6827b7e9b2c575
2018-05-31 21:42:58 -07:00
5a78f3984f
Merge "recovery: add --fsck_unshare_blocks option for adb remount" am: bda4495176
...
am: b0d9b3594b
2018-05-31 18:11:40 -07:00
b0d9b3594b
Merge "recovery: add --fsck_unshare_blocks option for adb remount"
...
am: bda4495176
2018-05-31 18:01:58 -07:00
bda4495176
Merge "recovery: add --fsck_unshare_blocks option for adb remount"
2018-06-01 00:28:52 +00:00
7d5746309b
Merge "updater_sample: Add @GuardedBy" am: 2759733136
...
am: a37a085a11
2018-05-31 17:19:55 -07:00
3bb7b616a3
Merge "updater_sample: Improve update completion handling" am: 9455173f87
...
am: 86f05074d2
2018-05-31 17:19:00 -07:00
8d6905d952
Merge "updater: Drop the 'blocks' parameter in LoadStash()." am: 0b80ba14d7
...
am: 838f30a8f7
2018-05-31 17:14:33 -07:00
a37a085a11
Merge "updater_sample: Add @GuardedBy"
...
am: 2759733136
2018-05-31 16:21:11 -07:00
86f05074d2
Merge "updater_sample: Improve update completion handling"
...
am: 9455173f87
2018-05-31 16:20:50 -07:00
51cde1e60c
updater_sample: validate state only once
...
Test: on device
Change-Id: I0a8a87d7b69f0efdcbd17facbf42cb94fb96fe51
Signed-off-by: Zhomart Mukhamejanov <zhomart@google.com >
2018-05-31 23:12:43 +00:00
2759733136
Merge "updater_sample: Add @GuardedBy"
2018-05-31 23:12:34 +00:00
f6522eba71
updater_sample: Add @GuardedBy
...
Test: on the device
Change-Id: I15762dafec1814980e1c2529f5fc2048853c8ff2
Signed-off-by: Zhomart Mukhamejanov <zhomart@google.com >
2018-05-31 23:12:28 +00:00
9455173f87
Merge "updater_sample: Improve update completion handling"
2018-05-31 23:12:15 +00:00
838f30a8f7
Merge "updater: Drop the 'blocks' parameter in LoadStash()."
...
am: 0b80ba14d7
2018-05-31 16:00:40 -07:00
7671f68ab8
updater_sample: Improve update completion handling
...
Currently sample app relies on onPayloadApplicationComplete
callback. It might not get invoked when app is unbound and
update is complete.
On the other hand, onStatusUpdate gets invoked always
(except when update_engine fails to init).
It's good to rely on onStatusUpdate callback to
reapply the update if it's IDLE but sample app state
is RUNNING.
- Add methods to ensure correct updater state.
- Update README.md.
BUG: 80205922
Test: on the device
Change-Id: Ic2f390e85af43556e227362321ab69f0ff146188
Signed-off-by: Zhomart Mukhamejanov <zhomart@google.com >
2018-05-31 21:13:05 +00:00
0b80ba14d7
Merge "updater: Drop the 'blocks' parameter in LoadStash()."
2018-05-31 20:22:25 +00:00
64957ce4b1
updater: Drop the 'blocks' parameter in LoadStash().
...
None of the callers actually uses the value.
(Even in the earlier versions, e.g. the one in M, the value wasn't used
either.)
Test: Run recovery_component_test on marlin.
Change-Id: I53e61a1afa211f71a200889ed3aa4046763b46ea
2018-05-30 16:34:24 -07:00
edee8361d7
recovery: add --fsck_unshare_blocks option for adb remount
...
Allow "adb remount" on deduplicated filesystems to reboot into recovery
and run e2fsck to undo deduplication. The e2fsck binary is copied from
the system partition into tmpfs, and the system partition is unmounted
so e2fsck can run safely.
Bug: 64109868
Test: recovery with --fsck_unshare_blocks; adb remount
Change-Id: I7558749b018b58f3c4339e51a95831dbd5be1ae3
2018-05-30 13:24:30 -07:00
b2865b044a
Merge "updater_sample: add UpdaterState" am: 721f6d851f am: b2a0611ea7
...
am: 57c4fe1f33
2018-05-29 21:45:49 -07:00
152cde2c09
Merge "updater_sample: add UpdateData" am: 8f15a82229 am: 8dd98e8c45
...
am: a207a43052
2018-05-29 21:40:54 -07:00
324806a751
Merge "recovery: c++ify pthread use in UI" am: 85a007c47c am: 956580b139
...
am: ebb47acad4
2018-05-29 21:40:15 -07:00
57c4fe1f33
Merge "updater_sample: add UpdaterState" am: 721f6d851f
...
am: b2a0611ea7
2018-05-29 19:44:39 -07:00
a207a43052
Merge "updater_sample: add UpdateData" am: 8f15a82229
...
am: 8dd98e8c45
2018-05-29 19:44:24 -07:00
ebb47acad4
Merge "recovery: c++ify pthread use in UI" am: 85a007c47c
...
am: 956580b139
2018-05-29 19:44:09 -07:00
b2a0611ea7
Merge "updater_sample: add UpdaterState"
...
am: 721f6d851f
2018-05-29 18:49:49 -07:00
8dd98e8c45
Merge "updater_sample: add UpdateData"
...
am: 8f15a82229
2018-05-29 18:49:15 -07:00
721f6d851f
Merge "updater_sample: add UpdaterState"
2018-05-30 01:36:36 +00:00
8f15a82229
Merge "updater_sample: add UpdateData"
2018-05-30 01:34:53 +00:00
Zhomart Mukhamejanov
Tao Bao
Tianjie Xu
Treehugger Robot
David Anderson
Jerry Zhang