Commit Graph

5805 Commits

Author SHA1 Message Date
Zhomart Mukhamejanov 321a7134e9 Merge "updater_sample: Add UI docs to README"
am: e36b6ec97c

Change-Id: I6953b9a20563f91901f776e737e151f061ff2575
2018-06-04 17:06:56 -07:00
Zhomart Mukhamejanov 188190cc8c Merge "updater_sample: improve updater state handling"
am: 269be9f22d

Change-Id: I803895e6d67e11e8e58873af89fd6710cab5334f
2018-06-04 17:05:59 -07:00
Zhomart Mukhamejanov e36b6ec97c Merge "updater_sample: Add UI docs to README" 2018-06-04 23:19:05 +00:00
Zhomart Mukhamejanov 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
Zhomart Mukhamejanov 269be9f22d Merge "updater_sample: improve updater state handling" 2018-06-04 23:18:43 +00:00
Zhomart Mukhamejanov 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
Tao Bao 1d33962b86 Merge "tests: Add ResumableUpdaterTest."
am: a21a63bf56

Change-Id: I63bcdd7c86765f9671531d703fdafcae381a4c48
2018-06-04 14:16:05 -07:00
Tao Bao a21a63bf56 Merge "tests: Add ResumableUpdaterTest." 2018-06-04 19:25:21 +00:00
Tao Bao 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
Zhomart Mukhamejanov 8bb3085865 Merge "updater_sample: validate state only once"
am: 02ee7bf29d

Change-Id: I2752740e1c101203e34ca6bbb20664a728b99908
2018-06-01 12:03:06 -07:00
Zhomart Mukhamejanov 02ee7bf29d Merge "updater_sample: validate state only once" 2018-06-01 18:52:37 +00:00
Tianjie Xu 80918c9773 Merge "Let gr_init proceed even if we failed to load a font file"
am: 2d85a0f6f7

Change-Id: I2c830126f9d6a060d321ce48e7602fc808836e11
2018-06-01 03:14:54 -07:00
Treehugger Robot 2d85a0f6f7 Merge "Let gr_init proceed even if we failed to load a font file" 2018-06-01 06:27:30 +00:00
Tianjie Xu 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
David Anderson b0d9b3594b Merge "recovery: add --fsck_unshare_blocks option for adb remount"
am: bda4495176

Change-Id: I7ca5126573f977d8e6204420d66617a7dc207688
2018-05-31 18:01:58 -07:00
Treehugger Robot bda4495176 Merge "recovery: add --fsck_unshare_blocks option for adb remount" 2018-06-01 00:28:52 +00:00
Zhomart Mukhamejanov a37a085a11 Merge "updater_sample: Add @GuardedBy"
am: 2759733136

Change-Id: I7c0811201ec55e64aba60f6582ee2c0c1ddca870
2018-05-31 16:21:11 -07:00
Zhomart Mukhamejanov 86f05074d2 Merge "updater_sample: Improve update completion handling"
am: 9455173f87

Change-Id: Id4b1ff4cc2afe36a0acffe3bc0a323cc06416c6c
2018-05-31 16:20:50 -07:00
Zhomart Mukhamejanov 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
Zhomart Mukhamejanov 2759733136 Merge "updater_sample: Add @GuardedBy" 2018-05-31 23:12:34 +00:00
Zhomart Mukhamejanov 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
Zhomart Mukhamejanov 9455173f87 Merge "updater_sample: Improve update completion handling" 2018-05-31 23:12:15 +00:00
Tao Bao 838f30a8f7 Merge "updater: Drop the 'blocks' parameter in LoadStash()."
am: 0b80ba14d7

Change-Id: I24ed7f67fb2a8c4eaccaa075a73dbfc006d16f93
2018-05-31 16:00:40 -07:00
Zhomart Mukhamejanov 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
Tao Bao 0b80ba14d7 Merge "updater: Drop the 'blocks' parameter in LoadStash()." 2018-05-31 20:22:25 +00:00
Tao Bao 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
David Anderson 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
Zhomart Mukhamejanov b2a0611ea7 Merge "updater_sample: add UpdaterState"
am: 721f6d851f

Change-Id: Ic5f9ecadcb2af07048dd60660c1fbb64591aa547
2018-05-29 18:49:49 -07:00
Zhomart Mukhamejanov 8dd98e8c45 Merge "updater_sample: add UpdateData"
am: 8f15a82229

Change-Id: I0b155b9b49e7686170cc51adf6bd84d54e0bc0f1
2018-05-29 18:49:15 -07:00
Zhomart Mukhamejanov 721f6d851f Merge "updater_sample: add UpdaterState" 2018-05-30 01:36:36 +00:00
Zhomart Mukhamejanov 8f15a82229 Merge "updater_sample: add UpdateData" 2018-05-30 01:34:53 +00:00
Jerry Zhang 956580b139 Merge "recovery: c++ify pthread use in UI"
am: 85a007c47c

Change-Id: Ib060a22927dd7299d567d3961064119cac69bfef
2018-05-29 18:34:12 -07:00
Jerry Zhang 85a007c47c Merge "recovery: c++ify pthread use in UI" 2018-05-30 00:48:30 +00:00
Jerry Zhang b31f9ce6d1 recovery: c++ify pthread use in UI
Change pthread usage to std::mutex,
lock_guard, unique_lock, thread, or
condition_variable as appropriate.

Test: Recovery works, recovery_component_test pass
Bug: 78793464
Change-Id: Ibf0b1bbedcf0b6e32fc4ee6aaadd17f21b4d7077
2018-05-29 15:20:58 -07:00
Tao Bao 4fcc200272 Merge "ui: Use std::thread to create input/progress threads."
am: b8634ca793

Change-Id: I18e13b53ad6a828f41fb7afc116178e2ae4a44f2
2018-05-29 14:16:52 -07:00
Tao Bao b8634ca793 Merge "ui: Use std::thread to create input/progress threads." 2018-05-29 21:06:34 +00:00
Tao Bao 89d65805c6 Merge "updater: Add Commmand class to manage BBOTA commands."
am: a488bd992f

Change-Id: I43b6fc941dc412478fff937f08306990ff74d9e2
2018-05-29 12:39:12 -07:00
Tao Bao a488bd992f Merge "updater: Add Commmand class to manage BBOTA commands." 2018-05-29 19:32:22 +00:00
Tao Bao 9016deefe4 Merge "tools: Move to Soong."
am: 6b16093b29

Change-Id: I08afe905ab4ece8e90ac5685f8fa7e48c597b7a0
2018-05-29 11:04:21 -07:00
Tao Bao 6b16093b29 Merge "tools: Move to Soong." 2018-05-29 17:55:39 +00:00
Zhomart Mukhamejanov 674aa6c611 updater_sample: add UpdaterState
- Add UpdaterState - atomic class, handles proper
  state changes.
- Remove util.UpdaterStates.

Test: compiled and ran on the device
Change-Id: I7fa87bbf09f8289632e8de1f26654365f4891700
Signed-off-by: Zhomart Mukhamejanov <zhomart@google.com>
2018-05-25 23:27:07 -07:00
Zhomart Mukhamejanov b34f7ea9a5 updater_sample: add UpdateData
This class allows easily passing update data to
apply payload, re-applying the updata data,
and in the future persisting.

Test: on the device
Change-Id: Ie01c5f3384c421bf1180122f27811c644179e3f5
Signed-off-by: Zhomart Mukhamejanov <zhomart@google.com>
2018-05-25 23:23:30 -07:00
Tao Bao c3901231ce updater: Add Commmand class to manage BBOTA commands.
Move the commands map parsing out of PerformBlockImageUpdate(), as this
can be done more easily by the caller.

The goal (not done in this CL) is to decouple command parsing logic from
the performers. This allows (a) focusing on the command logic in the
performer; and (b) extending BBOTA commands syntax separately.

Test: Run recovery_unit_test and recovery_component_test.
Change-Id: Ife202398a7660b152d84a3ba17b90f93d19c55f2
2018-05-25 15:26:42 -07:00
Tao Bao 101af85e34 Merge "updater_sample: Add OWNERS."
am: 44e857390a

Change-Id: Ie7934d1a0b87741d21ad83ed2822af0602b507b6
2018-05-25 11:23:38 -07:00
Treehugger Robot 44e857390a Merge "updater_sample: Add OWNERS." 2018-05-25 18:15:13 +00:00
Zhomart Mukhamejanov 4e17087235 Merge "updater_sample: add updater state"
am: c290e088ed

Change-Id: I714b69a34be85fa46df2f533328a20efe45c5f83
2018-05-25 11:13:06 -07:00
Zhomart Mukhamejanov c290e088ed Merge "updater_sample: add updater state" 2018-05-25 18:03:17 +00:00
Tao Bao 35db9cf666 updater_sample: Add OWNERS.
Test: N/A
Change-Id: I519a0fa38b87c7d826ed07414d14a4f7a858aeb4
2018-05-25 09:43:08 -07:00
Zhomart Mukhamejanov 8f4059d603 updater_sample: add updater state
- Add util.UpdaterStates - the state of SystemUpdaterSample.
    It's different from status of UpdateEngine;
    when UpdateEngine#cancel is used to suspend the update,
    UpdateEngine sets status to IDLE, which cannot be used
    to track the suspended state.
- UI: Change 'Update status' to 'Engine status'.
- UI: Change 'Update completion' to 'Engine error code'.
- UI: Add 'Updater state'.

Test: manually on the device
Test: using JUnit4
Change-Id: I9c58b5ed0eae3be7ab8b217fc01a621e8fb2f4bf
Signed-off-by: Zhomart Mukhamejanov <zhomart@google.com>
2018-05-25 16:25:34 +00:00
Tao Bao 17d46f2551 Merge "tests: Setup last_command_file for UpdaterTest."
am: d1e0cda4d6

Change-Id: I8c1ea753886f284d1e8462e16b06968ebdffc874
2018-05-24 23:37:48 -07:00