Commit Graph

6021 Commits

Author SHA1 Message Date
android-build-prod (mdb) 5ba2fa1c4e Merge "screen_ui: Merge Menu::Start() into its ctor." am: 0cabcd0126 am: bcf8beaeed
am: 704d11fac2

Change-Id: Ica240779f3b59008b1fb97677ced878c58a1a8cb
2018-05-02 22:09:22 -07:00
android-build-prod (mdb) 704d11fac2 Merge "screen_ui: Merge Menu::Start() into its ctor." am: 0cabcd0126
am: bcf8beaeed

Change-Id: I3fdc5fb0f72c36e225cb26fc643e39b254bc492e
2018-05-02 22:05:21 -07:00
android-build-prod (mdb) bcf8beaeed Merge "screen_ui: Merge Menu::Start() into its ctor."
am: 0cabcd0126

Change-Id: I739ab9b6d3aa2a52f2fd51adbf84664301f22ca6
2018-05-02 22:01:49 -07:00
android-build-prod (mdb) 0cabcd0126 Merge "screen_ui: Merge Menu::Start() into its ctor." 2018-05-03 04:54:24 +00:00
Zhomart Mukhamejanov bf13b18dd9 Merge "updater_sample: Add streaming to PayloadSpec" am: 3a79b36377 am: 98837bdcd1
am: 2e8e6e3ab4

Change-Id: Iee52b8119d33c32859ff84abf7fd678916b07f32
2018-05-02 20:34:25 -07:00
Zhomart Mukhamejanov 2e8e6e3ab4 Merge "updater_sample: Add streaming to PayloadSpec" am: 3a79b36377
am: 98837bdcd1

Change-Id: I46ccdf6e51ed48cf5eec21b21d8b70ed5b376df9
2018-05-02 20:30:53 -07:00
Zhomart Mukhamejanov 98837bdcd1 Merge "updater_sample: Add streaming to PayloadSpec"
am: 3a79b36377

Change-Id: I576233f982e2dea6abeb9267ffddc2760dad4d4e
2018-05-02 20:27:20 -07:00
Zhomart Mukhamejanov 3a79b36377 Merge "updater_sample: Add streaming to PayloadSpec" 2018-05-03 03:22:45 +00:00
android-build-prod (mdb) 4671350c5d Merge "screen_ui: Use std::string in DrawTextLine() and siblings." am: b4ded4a6ce am: a9d78d45d6
am: 01118c1cd8

Change-Id: I183c66d87b58a0eb55563568e2a263ac170cd851
2018-05-02 19:31:04 -07:00
Tao Bao e02a5b248b screen_ui: Merge Menu::Start() into its ctor.
Since we instantiate a Menu object each time for a given set of
header/items, we don't have a use case of re-populating an existing Menu
with different data (which is what Menu::Start() does).

Test: mmma -j bootable/recovery
Test: Run recovery_unit_test on marlin.
Test: Build and boot into recovery image on angler. Check the UI.
Change-Id: Iaa2ba9d406ebd74c015e43198c17c5335b38df53
2018-05-02 19:30:15 -07:00
android-build-prod (mdb) 01118c1cd8 Merge "screen_ui: Use std::string in DrawTextLine() and siblings." am: b4ded4a6ce
am: a9d78d45d6

Change-Id: I6b4ea6332a9416ac8036cd9c2d1d23695a7c5914
2018-05-02 19:21:02 -07:00
android-build-prod (mdb) a9d78d45d6 Merge "screen_ui: Use std::string in DrawTextLine() and siblings."
am: b4ded4a6ce

Change-Id: I02fad9395511c716d790f1a1e3f5065532a8433b
2018-05-02 19:16:59 -07:00
android-build-prod (mdb) b4ded4a6ce Merge "screen_ui: Use std::string in DrawTextLine() and siblings." 2018-05-03 02:12:48 +00:00
Tao Bao 1c24bd6f39 Merge "screen_ui: Drop the dependency on common.h." am: 738a4258d8 am: 30f2775b37
am: 1875991c71

Change-Id: I6995f59e2a6859d5b5d1e5cdf49c0f19261b829f
2018-05-02 15:45:52 -07:00
Tao Bao 93e46ad426 screen_ui: Use std::string in DrawTextLine() and siblings.
Test: mmma -j bootable/recovery
Test: Build and boot into recovery image on angler. Check the UI.
Test: Repeat the same test on devices using wearable UI.
Change-Id: I1a67ff4ae8de4d7a8dc66326cf07f95c89e95152
2018-05-02 15:32:48 -07:00
Tao Bao 1875991c71 Merge "screen_ui: Drop the dependency on common.h." am: 738a4258d8
am: 30f2775b37

Change-Id: Id553c1f1de86fa292c0327f6fcc00fb8cd17bec3
2018-05-02 14:49:56 -07:00
Tao Bao 30f2775b37 Merge "screen_ui: Drop the dependency on common.h."
am: 738a4258d8

Change-Id: I337db6f14a9a7dd6394040026e004eec717cf487
2018-05-02 14:41:24 -07:00
Tao Bao 738a4258d8 Merge "screen_ui: Drop the dependency on common.h." 2018-05-02 21:28:19 +00:00
Tao Bao 1d156b9882 screen_ui: Drop the dependency on common.h.
Remove the use of fopen_path() in screen_ui.cpp, as this is the only
place that requires the dependency on common.h. The mounting work should
be done by the caller.

Also change the parameter in RecoveryUI::ShowFile() from const char* to
const std::string&.

Test: mmma -j bootable/recovery
Test: Build and boot into recovery image on angler. Choose 'View
      recovery logs'.
Change-Id: I8e63f14a8e2b12b856e5a92476e4226cd6ea39fb
2018-05-02 12:46:21 -07:00
Zhomart Mukhamejanov da7e237596 updater_sample: Add streaming to PayloadSpec
PayloadSpec
- add streaming generator and tests
- fix sample.json
- fix tests
- rename PackagePropertyFiles to PackageFiles, it has info
  not only about property files, and new name is shorter

Bug: 77148467
Test: `mmma -j bootable/recovery/updater_sample`
Change-Id: I9c1206c07c37183f13d3c25940f12981ca85b1b4
Signed-off-by: Zhomart Mukhamejanov <zhomart@google.com>
2018-05-02 12:40:49 -07:00
Tao Bao 917111eb41 Merge "Add ScreenRecoveryUI::ShowMenu()." am: cac3ec3513 am: a2f44ebd09
am: f0fd4f5983

Change-Id: Ifb6649be23644a366f2830ca50748b21d2ad92c1
2018-05-01 13:48:38 -07:00
Tao Bao f0fd4f5983 Merge "Add ScreenRecoveryUI::ShowMenu()." am: cac3ec3513
am: a2f44ebd09

Change-Id: Ifd9b438412fa2c2ca6d3bfcbfe3d620b15663070
2018-05-01 13:46:04 -07:00
Tao Bao a2f44ebd09 Merge "Add ScreenRecoveryUI::ShowMenu()."
am: cac3ec3513

Change-Id: Iaad9bc980d8db3a02dbae77af234cf1aefccdbd1
2018-05-01 13:40:29 -07:00
Tao Bao cac3ec3513 Merge "Add ScreenRecoveryUI::ShowMenu()." 2018-05-01 20:32:37 +00:00
Zhomart Mukhamejanov 43318fb455 Merge "updater_sample: add FileDownloader" am: 5c119482b3 am: 013098f6d2
am: f23115cc60

Change-Id: I13ccf97f8630900c6860ba845b6258ef70c5692c
2018-05-01 12:24:50 -07:00
Zhomart Mukhamejanov 5faa5523cb Merge "updater_sample: Improve UpdateConfig" am: af5958818a am: 0b54d77832
am: 58520947e5

Change-Id: I098d654a971eea954976e611c3c6e3290f06aa6d
2018-05-01 12:24:36 -07:00
Zhomart Mukhamejanov f23115cc60 Merge "updater_sample: add FileDownloader" am: 5c119482b3
am: 013098f6d2

Change-Id: Id8ef6d4f0bd64d03b0da21bb9ec0e732066e749d
2018-05-01 12:20:35 -07:00
Zhomart Mukhamejanov 58520947e5 Merge "updater_sample: Improve UpdateConfig" am: af5958818a
am: 0b54d77832

Change-Id: I056e1f96f6c444dc0ecfd5f3d7a2f34a0f04f50d
2018-05-01 12:14:33 -07:00
Zhomart Mukhamejanov 013098f6d2 Merge "updater_sample: add FileDownloader"
am: 5c119482b3

Change-Id: I4e2da88f762df0c3fa63a1b5c6c2389c7683291d
2018-05-01 12:14:32 -07:00
Zhomart Mukhamejanov 0b54d77832 Merge "updater_sample: Improve UpdateConfig"
am: af5958818a

Change-Id: Ia8fd285ece0dec638273abf3c531fbd1c052becb
2018-05-01 12:10:32 -07:00
Zhomart Mukhamejanov 5c119482b3 Merge "updater_sample: add FileDownloader" 2018-05-01 19:08:59 +00:00
Zhomart Mukhamejanov 93535dd033 updater_sample: add FileDownloader
Test: unit tests

Change-Id: I10933e7172d7ebc34c7cf5e4274625d7b8399246
Signed-off-by: Zhomart Mukhamejanov <zhomart@google.com>
2018-05-01 12:08:18 -07:00
Zhomart Mukhamejanov af5958818a Merge "updater_sample: Improve UpdateConfig" 2018-05-01 19:05:22 +00:00
Tao Bao 9a28560ec6 [automerger skipped] Merge "recovery: Split main() into recovery_main.cpp." am: 0204e88073 am: 17f6c1b041 -s ours
am: 9fa43507ef  -s ours

Change-Id: I2c4296f41a5fa7f8f2ca8cc44134075aae3f5ff1
2018-05-01 11:19:10 -07:00
Tao Bao 9fa43507ef [automerger skipped] Merge "recovery: Split main() into recovery_main.cpp." am: 0204e88073
am: 17f6c1b041  -s ours

Change-Id: I86f2a84affaf0d03be0431d35d265767b1ba68c1
2018-05-01 11:09:47 -07:00
Tao Bao 17f6c1b041 Merge "recovery: Split main() into recovery_main.cpp."
am: 0204e88073

Change-Id: I474502fc51b28b3e69e9638c82534bfea62903a7
2018-05-01 11:04:46 -07:00
Tao Bao 0204e88073 Merge "recovery: Split main() into recovery_main.cpp." 2018-05-01 17:54:40 +00:00
Tao Bao 3aec6965bf Add ScreenRecoveryUI::ShowMenu().
From caller's PoV, RecoveryUI::{Start,Select,End}Menu should always be
used together, i.e. to show a menu and get user's selection. This CL
provides ShowMenu() as one-stop service (which is based on
get_menu_selection() from recovery.cpp).

Also move RecoveryUI::{Start,Select,End}Menu into ScreenRecoveryUI, with
a dropped access level from public to protected.

Due to the dependency on recovery / librecovery refactoring, will add
testcases in follow-up CLs.

Test: Build and boot into recovery image. Check the menus (main menu,
      'View recovery logs', 'Wipe data/factory reset').
Change-Id: Ie17aa78144871a12affd6f9075e045f76608a0ba
2018-05-01 10:27:40 -07:00
Zhomart Mukhamejanov 963e3eeb00 updater_sample: Improve UpdateConfig
UpdateConfig:
- constant names changed
- added parsing streaming metadata
- added InnerFile to describe a file in zip

Android.mk
- added guava

tests fixed

Test: using junit4

Change-Id: Ibe3c8a3bde20259b0eea9a79aca4b22ed7b048f4
Signed-off-by: Zhomart Mukhamejanov <zhomart@google.com>
2018-05-01 10:24:57 -07:00
Tao Bao 6d99d4b457 recovery: Split main() into recovery_main.cpp.
This prepares for moving more codes from recovery into librecovery, so
that they will become more easily testable. recovery_main.cpp will be
the source code for recovery module, with the rest moved into
librecovery. recovery_main.cpp mainly does the initializations, such as
setting up the logger.

Test: mmma -j bootable/recovery
Test: recovery_component_test
Test: Build and boot into recovery image on marlin.
Change-Id: I8e846524546b6f3f0e32ed869e851f62261eef23
Merged-In: I8e846524546b6f3f0e32ed869e851f62261eef23
2018-05-01 09:48:00 -07:00
Tao Bao 97d757fbfc recovery: Split main() into recovery_main.cpp.
am: 2ac56afc7b

Change-Id: I55d51dafb45b5395829c40b045e8135f8a302e98
2018-05-01 08:57:06 -07:00
Tao Bao 2ac56afc7b recovery: Split main() into recovery_main.cpp.
This prepares for moving more codes from recovery into librecovery, so
that they will become more easily testable. recovery_main.cpp will be
the source code for recovery module, with the rest moved into
librecovery. recovery_main.cpp mainly does the initializations, such as
setting up the logger.

Test: mmma -j bootable/recovery
Test: recovery_component_test
Test: Build and boot into recovery image on marlin.
Change-Id: I8e846524546b6f3f0e32ed869e851f62261eef23
(cherry picked from commit c241cb662440551eb0d2f42345f7ee08cf60a7dd)
2018-04-30 21:04:55 -07:00
Tao Bao 7ffa008463 Merge "Drop '#include "ui.h"' from device.h." am: 2de12da142 am: 7e61191258
am: 39caabc7e3

Change-Id: I9a9de8eafc7e5730d83153fcb8aff409d2cee417
2018-04-30 19:41:10 -07:00
Tao Bao 39caabc7e3 Merge "Drop '#include "ui.h"' from device.h." am: 2de12da142
am: 7e61191258

Change-Id: I1db9c680ccbaa877a2c730541133436c16f7d467
2018-04-30 19:09:47 -07:00
Tao Bao 7e61191258 Merge "Drop '#include "ui.h"' from device.h."
am: 2de12da142

Change-Id: I339621dbc9c8cebe78fa7bcf30e9c7e070e649af
2018-04-30 19:04:03 -07:00
Tao Bao 2de12da142 Merge "Drop '#include "ui.h"' from device.h." 2018-05-01 01:54:45 +00:00
Tao Bao c16fd8a931 Drop '#include "ui.h"' from device.h.
We don't need the dependency in the header.

Test: mmma -j bootable/recovery
Change-Id: I03741ae7911a7e8bf1284b2821cf986ca0ab434e
2018-04-30 17:15:17 -07:00
Tao Bao 372abb6c5e Merge changes I78839ed4,I75ac0e26 am: e4d65b681a am: 040674586b
am: c3674ab1b2

Change-Id: If833a45f3b40592b5c94cbdb51322c90855fe397
2018-04-30 13:05:24 -07:00
Tao Bao c3674ab1b2 Merge changes I78839ed4,I75ac0e26 am: e4d65b681a
am: 040674586b

Change-Id: I27548f7aa4871b50584a0c88d33e6383755f648e
2018-04-30 12:58:47 -07:00
Tao Bao 040674586b Merge changes I78839ed4,I75ac0e26
am: e4d65b681a

Change-Id: I303e20e6d7f36a355f6cca9798c3c598fe10777b
2018-04-30 12:53:55 -07:00