Commit Graph

5688 Commits

Author SHA1 Message Date
Tao Bao 8d593973d6 Merge "Device owns the RecoveryUI instance."
am: 6df846e337

Change-Id: I39b0576e0ff11f3c5d62b1611f47f44b8f18c382
2018-05-10 17:16:00 -07:00
Tao Bao 6df846e337 Merge "Device owns the RecoveryUI instance." 2018-05-11 00:03:55 +00:00
Zhomart Mukhamejanov 48294e3d86 Merge "updater_sample: fix UpdateConfig"
am: 7217e7045d

Change-Id: I63af09b000961e79613798c818eeea626eb221b6
2018-05-10 14:56:56 -07:00
Zhomart Mukhamejanov 7217e7045d Merge "updater_sample: fix UpdateConfig" 2018-05-10 21:45:03 +00:00
Zhomart Mukhamejanov bb8a215138 updater_sample: fix UpdateConfig
- fix UpdateConfig
- fix smaple.json
- fix FileDownloaderTest

Test: manually
Change-Id: I09d272f77c89a02f54a24cf753fdfda4ce243927
Signed-off-by: Zhomart Mukhamejanov <zhomart@google.com>
2018-05-10 12:19:16 -07:00
Zhomart Mukhamejanov 319e191238 Merge "updater_sample: add http header demo"
am: fe5b3e2b2d

Change-Id: I5f76d9f27d69fcdbe4f95194b34bad548f7e28e2
2018-05-10 10:59:06 -07:00
Zhomart Mukhamejanov fe5b3e2b2d Merge "updater_sample: add http header demo" 2018-05-10 16:03:34 +00:00
Tao Bao 551d2c3181 Device owns the RecoveryUI instance.
Test: mmma -j bootable/recovery
Test: Build and boot into recovery, w/ and w/o enabling quiescent mode
      respectively.
Change-Id: I5d9bb945a6c3c9a3b96199fa0c8071a2f91339a0
2018-05-09 21:22:26 -07:00
Zhomart Mukhamejanov 6aa5fb0bbe updater_sample: add http header demo
Added demo passing http headers to UpdateEngine#applyPayload.

Bug: 79483768
Test: manually
Change-Id: I3e9c812dba2066acadbcea8d07c933368806e20c
Signed-off-by: Zhomart Mukhamejanov <zhomart@google.com>
2018-05-09 17:33:52 -07:00
Tao Bao ae4b00c427 Merge "screen_ui: Fix an issue when displaying wrapped text."
am: 1d4ef4ba4b

Change-Id: I747fa14c2efaf81dd94cd81171424bff845a43b0
2018-05-09 14:17:29 -07:00
Tao Bao 1d4ef4ba4b Merge "screen_ui: Fix an issue when displaying wrapped text." 2018-05-09 21:11:09 +00:00
Tao Bao 452b487f31 screen_ui: Fix an issue when displaying wrapped text.
The last character at EOL is cut when showing the prompt-for-data-wipe
message on angler. Address the issue by keeping symmetrical margins
based on the given offset.

Test: Trigger prompt-and-wipe-data menu. No cutout character at EOL.
Change-Id: Id6e8dc7815bf681435bcaf13e7bdd09cf870d95f
2018-05-09 12:32:27 -07:00
Zhomart Mukhamejanov 9fdeb57ab0 Merge "updater_sample: update tools"
am: daa86e9024

Change-Id: I8d2d6173e307a6c409742439c4707d522bcd7be1
2018-05-08 18:18:22 -07:00
Zhomart Mukhamejanov e88d4682ea Merge "updater_sample: add streaming support"
am: c23a53c272

Change-Id: I4aa8a41a4dd3afd4b1c5fb3d6955abea45c16fc4
2018-05-08 18:17:23 -07:00
Zhomart Mukhamejanov daa86e9024 Merge "updater_sample: update tools" 2018-05-09 01:04:59 +00:00
Zhomart Mukhamejanov c23a53c272 Merge "updater_sample: add streaming support" 2018-05-09 01:04:41 +00:00
Zhomart Mukhamejanov 96eb59e4b1 updater_sample: update tools
- Allow gen_update_config.py to use ota_from_target_files from
  $ANDROID_BUILD_TOP/build/make/tools/releasetools/
- tests/res/raw/ota_002_package.zip re-generated using functions from
  $ANDROID_BUILD_TOP/build/make/tools/releasetools/test_ota_from_target_files.py
- sample app tests updated

Test: ./tools/gen_update_config_test.py
Change-Id: I5c492ec22782ba54fe481f592a44e797c695684e
Signed-off-by: Zhomart Mukhamejanov <zhomart@google.com>
2018-05-08 21:13:34 +00:00
Zhomart Mukhamejanov 0dd5a83d0e updater_sample: add streaming support
- UpdateConfigs: add helper methods for streaming
- add PrepareStreamingService intent service

Test: manually and junit4
Bug: 77148143
Change-Id: I61711eb9abe051987e725fbd94f8cd029ff21dd3
2018-05-08 21:12:33 +00:00
Tao Bao 5004300d6f Merge "recovery: Remove unneeded include of minui.h."
am: 0a2c4e260f

Change-Id: I6b072fba4b509ce801663e28e4fc53f180a776f2
2018-05-08 11:24:42 -07:00
android-build-prod (mdb) 730d541588 Merge "screen_ui: Drop the parameter in CheckBackgroundTextImages."
am: 1f3a9c0a43

Change-Id: Ibbb3e5673670ce112e1d15f961ad7ce5ea2d5c60
2018-05-08 11:21:43 -07:00
Tao Bao 0a2c4e260f Merge "recovery: Remove unneeded include of minui.h." 2018-05-08 18:21:00 +00:00
android-build-prod (mdb) 1f3a9c0a43 Merge "screen_ui: Drop the parameter in CheckBackgroundTextImages." 2018-05-08 18:11:35 +00:00
Tao Bao 07bf50a51d Merge "recovery: Get UI and locale from device."
am: d8abd2bd70

Change-Id: I15d5c733081a453224868a6dea9274456e7f7b89
2018-05-08 10:42:31 -07:00
Tao Bao d8abd2bd70 Merge "recovery: Get UI and locale from device." 2018-05-08 17:32:36 +00:00
Tao Bao 39c4918a40 screen_ui: Drop the parameter in CheckBackgroundTextImages.
ScreenRecoveryUI already has the info in locale_.

Also when showing "Current locale: X/Y" on screen, use 1-based index for
X, so that we have 1 <= X <= Y.

Test: Build anf flash recovery image on aosp_bullhead-userdebug. Choose
      `Run locale test` from UI.
Change-Id: I5dd4de82e63890ddf755f4e23cd2290ad5d50ece
2018-05-07 23:50:50 -07:00
Jerry Zhang 2dea53ef2b recovery: Get UI and locale from device.
This removes some reliance on the global
locale and ui variables.

Test: Recovery works
Bug: 78793464
Change-Id: I78f1a2b321f5d50aa58b10735a73ae137283353a
2018-05-08 06:09:54 +00:00
Tao Bao 260d4ba55f Merge "recovery: Refactor logging code into logging.cpp"
am: 5285c27bf4

Change-Id: I661d2250aeefb56a77ad686b726fc825f1d5a56f
2018-05-07 20:39:54 -07:00
Tao Bao 83ff1f0b05 recovery: Remove unneeded include of minui.h.
Test: mmma -j bootable/recovery
Change-Id: I1a79fa6386d56bf5e20ee074352d287403d2d745
2018-05-07 20:31:26 -07:00
Tao Bao 5285c27bf4 Merge "recovery: Refactor logging code into logging.cpp" 2018-05-08 03:30:50 +00:00
Tao Bao 83906f75bb Merge "updater: Skip an updated partition on retry."
am: 0ffe13b56f

Change-Id: I50582c6c397194713bb52cf1d04e541236e9d5c0
2018-05-07 18:15:43 -07:00
Tao Bao 0ffe13b56f Merge "updater: Skip an updated partition on retry." 2018-05-08 00:57:14 +00:00
Tao Bao 47bf5e68e6 Merge "updater: Fix an issue when resuming an update."
am: 1dc9e2ddef

Change-Id: Iee6d93057ee1c63a35fda2603a5fd5836db83179
2018-05-07 17:29:00 -07:00
Tao Bao 1dc9e2ddef Merge "updater: Fix an issue when resuming an update." 2018-05-08 00:16:32 +00:00
Tao Bao 98f875eee7 updater: Fix an issue when resuming an update.
We cannot skip "new" commands while resuming an update with
last_command_file, because they read in the data sequentially from the
package.

Bug: 69858743
Test: Interrupt an update that has new commands. Check the update log.
Change-Id: I05fb67246f5ea3ba2a0f78f10255c0d9b0bc2f5a
2018-05-07 22:14:45 +00:00
Tao Bao 864c668dd2 updater: Skip an updated partition on retry.
Prior to the change, the BBOTA updater would try to re-run all the
commands for a given partition on retry, including creating stashes
according to the list of commands. This could fail a retry when the
previous update had moved on to next stage, with leftovers in /cache.

This CL creates a marker on /cache upon successfully updating a
partition. The update commands will be skipped when trying to apply
updates on an updated partition. Note that the marker is expected to be
removed while doing a normal boot (in particular, handled by
RecoverySystem#handleAftermath). If that didn't happen, the updater
would also remove the marker before starting next fresh update.

Alternatively, we can achieve the same goal by changing the OTA script,
which needs to additionally compare the checksum against the target
build. For example,

  range_sha1("/system", "ranges") == SHA1_of_updated_system ||
  block_image_update("/system");

The downside is that we need to pay that cost on each install, as the
edify script doesn't support caching the result in a variable.

Bug: 79165963
Test: Simulate the process on device (by triggering a reboot while
      updating /vendor). Check the update log and result.
Change-Id: I731031fa336133e1221b33edfc469969706e8091
2018-05-07 15:05:00 -07:00
Jerry Zhang 152933a28e recovery: Refactor logging code into logging.cpp
Move common logging related functions to
rotate_logs.cpp, and rename that to logging.cpp.

Test: Recovery works
Bug: 78793464
Merged-In: I00f20a79a296680122b8437d54a87897c5cb2fc7
Change-Id: I00f20a79a296680122b8437d54a87897c5cb2fc7
2018-05-07 14:14:17 -07:00
android-build-prod (mdb) c4ba6b738f Merge changes I1cc5d702,I32ab9854
am: 420f7f8df4

Change-Id: I4efb48a107303b58c2b40a7a9d8e663c537e5a84
2018-05-04 10:38:41 -07:00
android-build-prod (mdb) 420f7f8df4 Merge changes I1cc5d702,I32ab9854
* changes:
  Move reboot() from common.h into otautil/sysutil.h.
  otautil: Rename dir/sys/thermal utils.
2018-05-04 17:26:11 +00:00
Tao Bao d7d087f31c Merge "otautil: Only build the needed files for host build."
am: 5818e894df

Change-Id: I2c9bf65f56c0bf9fe1d912717ef7952768d9a664
2018-05-04 09:30:47 -07:00
Tao Bao 5818e894df Merge "otautil: Only build the needed files for host build." 2018-05-04 16:08:18 +00:00
Tao Bao 2c52639d01 Move reboot() from common.h into otautil/sysutil.h.
This breaks the dependency on common.h (which belongs to
recovery/librecovery) from librecovery_ui. reboot() is now owned by
libotautil, which is expected to be a leaf node to be depended on.

With the change, recovery and updater also share the same reboot() code
now.

Test: mmma -j bootable/recovery
Change-Id: I1cc5d702cfe49302048db33d31c9c87ddc97ac71
2018-05-03 23:18:38 -07:00
Tao Bao 17054c051a otautil: Rename dir/sys/thermal utils.
Test: mmma -j bootable/recovery
Change-Id: I32ab98549e91f993364306e4a88dc654221b3869
2018-05-03 23:17:29 -07:00
Tao Bao 13446c032b otautil: Only build the needed files for host build.
This avoids unnecessarily breaking mac build.

Test: `mmma -j bootable/recovery` on Linux and macOS.
Change-Id: I1dc00364c895866a4757c2a43beb3432ae1e4113
2018-05-03 23:16:03 -07:00
Tao Bao 0d9ed29541 Merge "Move menu headers/items to std::vector<std::string>."
am: fb86bb2a07

Change-Id: I1bbef54e7117e8967a63290beaed70521d4de374
2018-05-03 16:21:16 -07:00
Tao Bao fb86bb2a07 Merge "Move menu headers/items to std::vector<std::string>." 2018-05-03 23:13:09 +00:00
Zhomart Mukhamejanov f3d1e58163 Merge "updater_sample: update tests"
am: 219445a320

Change-Id: I0f900f7612721b550826f0daffb030377468292b
2018-05-03 16:02:18 -07:00
Zhomart Mukhamejanov 219445a320 Merge "updater_sample: update tests" 2018-05-03 22:52:36 +00:00
Zhomart Mukhamejanov e606f6d3ff updater_sample: update tests
- fix tools/gen_update_config.py
- add tests for PayloadSpecs#forStreaming

Test: junit4
Change-Id: Ife1980c5f72944ed35500aa820b30031fc99e820
Signed-off-by: Zhomart Mukhamejanov <zhomart@google.com>
2018-05-03 14:04:16 -07:00
Tao Bao 1fe1afe863 Move menu headers/items to std::vector<std::string>.
Test: mmma -j bootable/recovery
Test: Run recovery_unit_test on marlin.
Test: Build and boot into recovery image on angler. Check the UI that
      shows menu ('View recovery log', 'Wipe data', 'Run locale test').
Test: Start recovery with '--prompt_and_wipe_data'. Check the UI.
Change-Id: If8a4209e0bb4ca64f719f9f9465d3b3589a69cdc
2018-05-03 12:31:18 -07:00
Zhomart Mukhamejanov c36f5ff1c7 Merge "updater_sample: update ui and README, clean-up"
am: 9c544a2bc6

Change-Id: I01da369a194bdb0b4d6d698dd835ce3bf9904756
2018-05-03 10:58:13 -07:00