756c12404c
Merge "ui: join only if joinable." am: 2454b2493a am: ccff03d196
...
am: b4aad37e21
2018-06-06 13:17:39 -07:00
b4aad37e21
Merge "ui: join only if joinable." am: 2454b2493a
...
am: ccff03d196
2018-06-06 11:07:02 -07:00
ccff03d196
Merge "ui: join only if joinable."
...
am: 2454b2493a
2018-06-06 10:08:15 -07:00
2454b2493a
Merge "ui: join only if joinable."
2018-06-06 16:41:52 +00:00
94371fd012
ui: join only if joinable.
...
The threads in RecoveryUI only get initialized if their Init()s finish
successfully.
Test: recovery_unit_test on marlin.
Change-Id: Ic4b62300a3cbd47887d9f4a90dc26f8a7deab616
2018-06-06 07:49:47 -07:00
69fdcf5bac
Merge "tests: Specify the death test style to avoid flakiness." am: 878d5a77f0 am: d770790a8f
...
am: 34a7cdc8ce
2018-06-05 23:29:38 -07:00
34a7cdc8ce
Merge "tests: Specify the death test style to avoid flakiness." am: 878d5a77f0
...
am: d770790a8f
2018-06-05 23:25:35 -07:00
d770790a8f
Merge "tests: Specify the death test style to avoid flakiness."
...
am: 878d5a77f0
2018-06-05 23:21:32 -07:00
878d5a77f0
Merge "tests: Specify the death test style to avoid flakiness."
2018-06-06 06:14:18 +00:00
42be0d47d9
tests: Specify the death test style to avoid flakiness.
...
As warned below (while running the test), the default death test style
(i.e. "fast") doesn't work well in a threaded context, which causes test
flakiness (timeout or early exit).
[WARNING] external/googletest/googletest/src/gtest-death-test.cc:836:: Death tests use fork(), which is unsafe particularly in a threaded context. For this test, Google Test detected 3 threads.
This CL specifies the death test styles to be "threadsafe" for the
following death tests.
- RangeSetTest.GetBlockNumber
- RangeSetTest.file_range
- ScreenRecoveryUITest.LoadAnimation_MissingAnimation
Test: mmma -j bootable/recovery
Test: Run recovery_unit_test on marlin. Test passes and the above
warning is gone.
Change-Id: I245bbc09286702d5cb326f878c4391e842b66cc5
2018-06-05 14:06:59 -07:00
31b994e8e9
Merge "updater_sample: Add UI docs to README" am: e36b6ec97c am: 321a7134e9
...
am: 8eed4aca52
2018-06-04 18:32:57 -07:00
1b30b73c4b
Merge "updater_sample: improve updater state handling" am: 269be9f22d am: 188190cc8c
...
am: ca9d2d71bf
2018-06-04 18:23:38 -07:00
8eed4aca52
Merge "updater_sample: Add UI docs to README" am: e36b6ec97c
...
am: 321a7134e9
2018-06-04 17:39:22 -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
321a7134e9
Merge "updater_sample: Add UI docs to README"
...
am: e36b6ec97c
2018-06-04 17:06:56 -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
e36b6ec97c
Merge "updater_sample: Add UI docs to README"
2018-06-04 23:19:05 +00:00
60abf5c653
updater_sample: Add UI docs to README
...
Test: N/A
Change-Id: Idc0a4fa778c23c503162337a682c872644e5419c
Signed-off-by: Zhomart Mukhamejanov <zhomart@google.com >
2018-06-04 23:18:55 +00: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
Tao Bao
Zhomart Mukhamejanov
Tianjie Xu
Treehugger Robot
David Anderson