Zhomart Mukhamejanov
a64639f104
Merge "updater_sample: validate state only once" am: 02ee7bf29d
...
am: 8bb3085865
Change-Id: I9921a274b17ce7ef2d64cb1f36337dc3f02aebf4
2018-06-01 12:08:09 -07: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
381fa3a7db
Merge "Let gr_init proceed even if we failed to load a font file" am: 2d85a0f6f7
...
am: 80918c9773
Change-Id: Iedd79892a6ce7a079f82e1d84117a865ae4c7d5a
2018-06-01 05:33:28 -07: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
5a78f3984f
Merge "recovery: add --fsck_unshare_blocks option for adb remount" am: bda4495176
...
am: b0d9b3594b
Change-Id: I86d3af476e87184e653de38cdb4faa1c9975ccba
2018-05-31 18:11:40 -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
7d5746309b
Merge "updater_sample: Add @GuardedBy" am: 2759733136
...
am: a37a085a11
Change-Id: I14c6cf3602233e29a8da9790cb4d0f37f10a59ca
2018-05-31 17:19:55 -07:00
Zhomart Mukhamejanov
3bb7b616a3
Merge "updater_sample: Improve update completion handling" am: 9455173f87
...
am: 86f05074d2
Change-Id: Iaefa58f57d11bf8b7091506326b721fe47f00058
2018-05-31 17:19:00 -07:00
Tao Bao
8d6905d952
Merge "updater: Drop the 'blocks' parameter in LoadStash()." am: 0b80ba14d7
...
am: 838f30a8f7
Change-Id: I7eac9d3a708fc70c5dc8c73c4b7a05c861c37cc2
2018-05-31 17:14:33 -07: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
57c4fe1f33
Merge "updater_sample: add UpdaterState" am: 721f6d851f
...
am: b2a0611ea7
Change-Id: Ie85e6ccc229abf22d79359a4c13523ab1fa857ca
2018-05-29 19:44:39 -07:00
Zhomart Mukhamejanov
a207a43052
Merge "updater_sample: add UpdateData" am: 8f15a82229
...
am: 8dd98e8c45
Change-Id: I125afc8a6812b023d8bc91402832a1355fa66d2f
2018-05-29 19:44:24 -07:00
Jerry Zhang
ebb47acad4
Merge "recovery: c++ify pthread use in UI" am: 85a007c47c
...
am: 956580b139
Change-Id: Ia3f1bad7a6c0e13a5d6920a4f43224e75b954800
2018-05-29 19:44:09 -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
1b55de658e
Merge "ui: Use std::thread to create input/progress threads." am: b8634ca793
...
am: 4fcc200272
Change-Id: I9efb46bb955ee8494575c7e7d9c34c63d5a418e6
2018-05-29 14:20:24 -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
7096f6b23c
Merge "updater: Add Commmand class to manage BBOTA commands." am: a488bd992f
...
am: 89d65805c6
Change-Id: Ief7bf42681ebffe92ac78d523b9f796fbca56c17
2018-05-29 12:43:15 -07: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
f91fdfb3fc
Merge "tools: Move to Soong." am: 6b16093b29
...
am: 9016deefe4
Change-Id: I1c8b1dd470279e3e5b8ca15c76dfe09691257bd6
2018-05-29 11:09:10 -07: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
e018a3b641
Merge "updater_sample: Add OWNERS." am: 44e857390a
...
am: 101af85e34
Change-Id: I39b232ba0b3c1bf0cad47a48f48b0f4e498fb4e7
2018-05-25 11:28:10 -07:00
Tao Bao
101af85e34
Merge "updater_sample: Add OWNERS."
...
am: 44e857390a
Change-Id: Ie7934d1a0b87741d21ad83ed2822af0602b507b6
2018-05-25 11:23:38 -07:00
Zhomart Mukhamejanov
22fb42b53f
Merge "updater_sample: add updater state" am: c290e088ed
...
am: 4e17087235
Change-Id: I698a9821d0e452e47a379051d68142f633ddb20a
2018-05-25 11:18:38 -07:00
Treehugger Robot
44e857390a
Merge "updater_sample: Add OWNERS."
2018-05-25 18:15:13 +00:00