Commit Graph

6271 Commits

Author SHA1 Message Date
Tao Bao d9b4d47ba3 Merge "updater: Drop the 'blocks' parameter in LoadStash()." am: 0b80ba14d7 am: 838f30a8f7
am: 8d6905d952

Change-Id: Ie6073a4ea2b2cbba0f09334fbee27b546d4fcf51
2018-05-31 22:26:19 -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
Tao Bao 838f30a8f7 Merge "updater: Drop the 'blocks' parameter in LoadStash()."
am: 0b80ba14d7

Change-Id: I24ed7f67fb2a8c4eaccaa075a73dbfc006d16f93
2018-05-31 16:00:40 -07: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
Zhomart Mukhamejanov b2865b044a Merge "updater_sample: add UpdaterState" am: 721f6d851f am: b2a0611ea7
am: 57c4fe1f33

Change-Id: I89a27867da037937a09224a03450c261a1b3373b
2018-05-29 21:45:49 -07:00
Zhomart Mukhamejanov 152cde2c09 Merge "updater_sample: add UpdateData" am: 8f15a82229 am: 8dd98e8c45
am: a207a43052

Change-Id: I16ba9eb2468258b3d2cc4afb11a8fe520917ce55
2018-05-29 21:40:54 -07:00
Jerry Zhang 324806a751 Merge "recovery: c++ify pthread use in UI" am: 85a007c47c am: 956580b139
am: ebb47acad4

Change-Id: I51071b091a91168dd05c2c4b33aa1b42c5769f97
2018-05-29 21:40:15 -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 f31290439c Merge "ui: Use std::thread to create input/progress threads." am: b8634ca793 am: 4fcc200272
am: 1b55de658e

Change-Id: I0b1e968d2aeb999a46e571ac3e09be5a84586231
2018-05-29 14:25:33 -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 b3285fd2f0 Merge "updater: Add Commmand class to manage BBOTA commands." am: a488bd992f am: 89d65805c6
am: 7096f6b23c

Change-Id: I4df0a857ba12ec87f049012b9d47ca17c185bf08
2018-05-29 12:57:03 -07: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 5c91663e6c Merge "tools: Move to Soong." am: 6b16093b29 am: 9016deefe4
am: f91fdfb3fc

Change-Id: Ibfbd0d8324af6145773b716cb14177c3cd5b3abf
2018-05-29 11:27:59 -07: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 e76ed816b9 Merge "updater_sample: Add OWNERS." am: 44e857390a am: 101af85e34
am: e018a3b641

Change-Id: Ia7c9dcc885f8b173171f48f73611adf912b748c4
2018-05-25 11:39:09 -07:00
Zhomart Mukhamejanov fad9dc5522 Merge "updater_sample: add updater state" am: c290e088ed am: 4e17087235
am: 22fb42b53f

Change-Id: I5218c15d084ff811aaf85207f33c4f20cde66866
2018-05-25 11:38:44 -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
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 5d63c909ab Merge "tests: Setup last_command_file for UpdaterTest." am: d1e0cda4d6 am: 17d46f2551
am: b78304e9c1

Change-Id: If12310f16affc88d6b7d52ee3ab91bfb8a26c5a0
2018-05-25 00:32:59 -07:00
Jiyong Park c5e16710e1 Merge "Mark as recovery_available:true" am: ddf2947359 am: 6d81f8732c
am: 63f4683ba7

Change-Id: I41a553d596e53b8673d44fac83ba04ee8b6e2aaf
2018-05-25 00:21:25 -07:00
Tao Bao b78304e9c1 Merge "tests: Setup last_command_file for UpdaterTest." am: d1e0cda4d6
am: 17d46f2551

Change-Id: Id67f00ecda761245c7a4ea7862542a2fd3f306d1
2018-05-24 23:41:49 -07: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
Tao Bao d1e0cda4d6 Merge "tests: Setup last_command_file for UpdaterTest." 2018-05-25 06:30:36 +00:00
Jiyong Park 63f4683ba7 Merge "Mark as recovery_available:true" am: ddf2947359
am: 6d81f8732c

Change-Id: I9b646784d89ccaf09074ae921d8bc0741479b3aa
2018-05-24 23:15:01 -07:00
Jiyong Park 6d81f8732c Merge "Mark as recovery_available:true"
am: ddf2947359

Change-Id: I1fbe5d274f1f1b5a00675a80fa9ad76cd603b042
2018-05-24 23:06:29 -07:00