Commit Graph

3641 Commits

Author SHA1 Message Date
Tao Bao 7b5992fa51 Merge "tests: Add testcase for show_progress() and set_progress()." am: 478a5ec9c7 am: 179fc8a82b am: ba0dad8828
am: 485b94f14d

Change-Id: I437572556bcbf8110a8d6d7ea00442675297822e
2017-01-06 17:58:31 +00:00
Tao Bao 485b94f14d Merge "tests: Add testcase for show_progress() and set_progress()." am: 478a5ec9c7 am: 179fc8a82b
am: ba0dad8828

Change-Id: If96d9335809c57629a58411429ff58c720c45ae2
2017-01-06 17:55:01 +00:00
Tao Bao ba0dad8828 Merge "tests: Add testcase for show_progress() and set_progress()." am: 478a5ec9c7
am: 179fc8a82b

Change-Id: I83bea4e1670fe7437e01f3dd232070807c28d77c
2017-01-06 17:51:31 +00:00
Tao Bao 179fc8a82b Merge "tests: Add testcase for show_progress() and set_progress()."
am: 478a5ec9c7

Change-Id: I06ba1a53e13b1e9cbeaffad63d7b418782527166
2017-01-06 17:48:00 +00:00
Tao Bao 478a5ec9c7 Merge "tests: Add testcase for show_progress() and set_progress()." 2017-01-06 17:42:29 +00:00
Tao Bao 9aa7ab5b10 tests: Add testcase for show_progress() and set_progress().
Test: recovery_component_test passes.
Change-Id: I4f00d0171cf86699e9ce747d07d7d44a01906e81
2017-01-05 17:50:10 -08:00
Tao Bao 2d22d4961b Merge "updater: Clean up CreateStash()." am: 91f74c82cd am: 719a15b187 am: fbb5dbb471
am: 36c895d8ae

Change-Id: I90eb56702bf528777e89fce04a9a548f5651a9e0
2017-01-05 21:47:07 +00:00
Tao Bao 36c895d8ae Merge "updater: Clean up CreateStash()." am: 91f74c82cd am: 719a15b187
am: fbb5dbb471

Change-Id: If1b1b5c2a52abde1cc6b860413efe935f326a63d
2017-01-05 21:43:37 +00:00
Tao Bao fbb5dbb471 Merge "updater: Clean up CreateStash()." am: 91f74c82cd
am: 719a15b187

Change-Id: I927826ffeb42053881bf35e5051ca3599205f3ee
2017-01-05 21:40:06 +00:00
Tao Bao 719a15b187 Merge "updater: Clean up CreateStash()."
am: 91f74c82cd

Change-Id: Ie7b92df12edf5bf8dc87806b22daf7ab1683d055
2017-01-05 21:37:05 +00:00
Tao Bao 91f74c82cd Merge "updater: Clean up CreateStash()." 2017-01-05 21:14:43 +00:00
Tao Bao 4d48ab169e Merge "imgdiff: Fix an edge case that leads to infinite loop." am: 3b828d879b am: 4d37763c69 am: e513c0f2ac
am: bcde135fce

Change-Id: I91af040f28085b4ab07fe191bee03b50c4c3ffce
2017-01-04 22:12:58 +00:00
Tao Bao bcde135fce Merge "imgdiff: Fix an edge case that leads to infinite loop." am: 3b828d879b am: 4d37763c69
am: e513c0f2ac

Change-Id: I24c52efcf8cd5055af9602dd6bc9b40f029816f9
2017-01-04 22:10:28 +00:00
Tao Bao e513c0f2ac Merge "imgdiff: Fix an edge case that leads to infinite loop." am: 3b828d879b
am: 4d37763c69

Change-Id: I85fac2fe7a6011dc62b86ed20b3f79650545050f
2017-01-04 22:08:56 +00:00
Tao Bao 4d37763c69 Merge "imgdiff: Fix an edge case that leads to infinite loop."
am: 3b828d879b

Change-Id: I810a00367d4ab384b6073a9416f39351e84dec84
2017-01-04 22:05:26 +00:00
Tao Bao 3b828d879b Merge "imgdiff: Fix an edge case that leads to infinite loop." 2017-01-04 21:59:26 +00:00
Jerry Zhang adeadcf908 Merge "Write aliases before ffs mount in recovery" am: 1302ea8725 am: 9f9d50d4ed am: e477a54c8d
am: 6bec66849b

Change-Id: I65ac28ca11d566fb73288940e954faacd378354c
2017-01-04 19:36:46 +00:00
Jerry Zhang 6bec66849b Merge "Write aliases before ffs mount in recovery" am: 1302ea8725 am: 9f9d50d4ed
am: e477a54c8d

Change-Id: I2fe7b5ebfea0216808b721a76eb816106b56e0cb
2017-01-04 19:34:16 +00:00
Tao Bao 66edafb88f Merge "recovery: Fix the broken UI text." am: 56fc8fa376 am: 1227f6b841 am: 3806993e25
am: 74e0ecb25b

Change-Id: If03ce22edaee2cf9aa38f3ea90ee992cd06695c3
2017-01-04 19:31:48 +00:00
Jerry Zhang e477a54c8d Merge "Write aliases before ffs mount in recovery" am: 1302ea8725
am: 9f9d50d4ed

Change-Id: I456a4b44b4a4df7d7752ee66784d26a94249c41c
2017-01-04 19:31:46 +00:00
Jerry Zhang 9f9d50d4ed Merge "Write aliases before ffs mount in recovery"
am: 1302ea8725

Change-Id: I90c2fbe1bb0d73ed2dc7ec0dd34edb0c11adf3df
2017-01-04 19:29:16 +00:00
Tao Bao 74e0ecb25b Merge "recovery: Fix the broken UI text." am: 56fc8fa376 am: 1227f6b841
am: 3806993e25

Change-Id: I68a27e971d8f786ae669e3bbef4218ea2ca1bbcd
2017-01-04 19:27:17 +00:00
Jerry Zhang 1302ea8725 Merge "Write aliases before ffs mount in recovery" 2017-01-04 19:24:02 +00:00
Tao Bao 3806993e25 Merge "recovery: Fix the broken UI text." am: 56fc8fa376
am: 1227f6b841

Change-Id: Idd6c7c84e599b1fcacf4c1601164742144b6e613
2017-01-04 19:22:48 +00:00
Jerry Zhang a61a672674 Write aliases before ffs mount in recovery
This is necessary to support kernel changes
that allow for multiple ffs functions. Some
kernels require aliases in order to name
function instances before mount time.

Test: Reboot into recovery, verify adb works
Bug: 34070894
Change-Id: I8376304d92af9b3e8c734fdb8cc77f0dc8bc4850
2017-01-04 11:20:19 -08:00
Jerry Zhang 2ea15590a6 Merge "Write aliases before ffs mount in recovery" 2017-01-04 19:19:07 +00:00
Tao Bao 1227f6b841 Merge "recovery: Fix the broken UI text."
am: 56fc8fa376

Change-Id: If83e5bf3b79fd753ad87ea8223ed59883dfcfafe
2017-01-04 19:17:47 +00:00
Jerry Zhang e66f861a7c Write aliases before ffs mount in recovery
This is necessary to support kernel changes
that allow for multiple ffs functions. Some
kernels require aliases in order to name
function instances before mount time.

Test: Reboot into recovery, verify adb works
Bug: 34070894
Change-Id: I8376304d92af9b3e8c734fdb8cc77f0dc8bc4850
2017-01-04 11:16:02 -08:00
Tao Bao 56fc8fa376 Merge "recovery: Fix the broken UI text." 2017-01-04 19:11:24 +00:00
Tao Bao 736d59c567 recovery: Fix the broken UI text.
UI text is broken (doesn't show any text during FDR) due to commit
d530449e54, which reordered the calls to
RecoveryUI::SetLocale() and RecoveryUI::Init().

Because Init() uses the locale info to load the localized texts (from
images), the locale must be set prior to that via SetLocale(). This CL
refactors Init() to take the locale parameter, and removes the odd
SetLocale() API.

Bug: 34029338
Test: 'Run graphics test' under recovery.
Change-Id: I620394a3d4e3705e9af5a1f6299285d143ae1b01
2017-01-03 22:40:03 -08:00
Tao Bao c54a36cff7 Merge "updater: Refactor parse_range()." am: 466e1b396a am: 6502c50e4b am: cb9c4fc4fb
am: d9aceb57f6

Change-Id: I259cb9f63ad2b1642429a56478882d879700e224
2017-01-04 06:15:29 +00:00
Tao Bao d9aceb57f6 Merge "updater: Refactor parse_range()." am: 466e1b396a am: 6502c50e4b
am: cb9c4fc4fb

Change-Id: I1f9f9da6e64519bece18e61466c5dd8ead714bcf
2017-01-04 06:12:59 +00:00
Tao Bao cb9c4fc4fb Merge "updater: Refactor parse_range()." am: 466e1b396a
am: 6502c50e4b

Change-Id: If5bbf6dfa0d23430ce54a9a127346427071e24cc
2017-01-04 06:10:59 +00:00
Tao Bao 6502c50e4b Merge "updater: Refactor parse_range()."
am: 466e1b396a

Change-Id: I2d9943062762fd3ac58ae8f5d6253c487e4a82d9
2017-01-04 06:08:58 +00:00
Tao Bao 466e1b396a Merge "updater: Refactor parse_range()." 2017-01-04 06:06:22 +00:00
Tao Bao b2ecd3f58f Merge "Remove outdated reference to icon_installing.png" am: 71633ebfb0 am: 05e7db3000 am: 83317083c8
am: d4506bc0d6

Change-Id: I3cfcff226f7d22bc66ed4f64b7b0b4d8471e077b
2017-01-04 01:54:14 +00:00
Tao Bao c844c06faf updater: Refactor parse_range().
Returning the parsed RangeSet directly (as opposed to using some pointer
parameter) to make the code cleaner.

Test: Apply an incremental with the new updater.
Change-Id: I8c99e701f189eb6a3eacc0d647e5a3a85fbeb3eb
2017-01-03 17:51:30 -08:00
Tao Bao d4506bc0d6 Merge "Remove outdated reference to icon_installing.png" am: 71633ebfb0 am: 05e7db3000
am: 83317083c8

Change-Id: If366a724c149edf404aa79f5fe54272a7c09b6f0
2017-01-04 01:47:13 +00:00
Tao Bao 83317083c8 Merge "Remove outdated reference to icon_installing.png" am: 71633ebfb0
am: 05e7db3000

Change-Id: I775376cd1850cd9d1f60d940afbcbbadf4ff8305
2017-01-04 01:37:12 +00:00
Tao Bao 05e7db3000 Merge "Remove outdated reference to icon_installing.png"
am: 71633ebfb0

Change-Id: I8e81d0c334e3fd015eda482e2a63dfb49c4f4ec3
2017-01-04 01:34:42 +00:00
Tao Bao 71633ebfb0 Merge "Remove outdated reference to icon_installing.png" 2017-01-04 01:26:56 +00:00
Tim Kryger 825b6b0c0b Remove outdated reference to icon_installing.png
The Wear recovery UI doesn't draw the installing icon but it was still
trying to open it.  Ever since these images were removed eight months
ago, this has resulted in an error printing to the screen at runtime.
Since the image wasn't really used, the lines to open it can simply be
removed.

Bug: 33203397
Change-Id: Id820f6d75e316c51d19b6095df407ecd61c0410e
(cherry picked from commit 48be23c8ed)
2017-01-03 16:28:13 -08:00
Tao Bao c77991c21d Merge "updater: Update the header name for bootloader.h." am: f9684c22c1 am: c58f5e73d5 am: c025f145cb
am: 2a8410740c

Change-Id: Ic0f8638092c5c3bf2366632ae624095c3faa7ff3
2017-01-03 23:54:36 +00:00
Tao Bao 2a8410740c Merge "updater: Update the header name for bootloader.h." am: f9684c22c1 am: c58f5e73d5
am: c025f145cb

Change-Id: I870949d42264520f3f9863aea07e26118865ac44
2017-01-03 23:52:07 +00:00
Tao Bao c025f145cb Merge "updater: Update the header name for bootloader.h." am: f9684c22c1
am: c58f5e73d5

Change-Id: I29f95f7e2117f3fbc7a9ffaa241e4c0f1710e268
2017-01-03 23:50:06 +00:00
Tao Bao c58f5e73d5 Merge "updater: Update the header name for bootloader.h."
am: f9684c22c1

Change-Id: Ide8973e237c9142de4f51351a0db66bb0d157451
2017-01-03 23:48:06 +00:00
Tao Bao f9684c22c1 Merge "updater: Update the header name for bootloader.h." 2017-01-03 23:45:02 +00:00
Tao Bao 5141221211 updater: Clean up CreateStash().
Change the stash size computation from int to size_t.

Test: Apply an incremental BBOTA with the new updater.
Change-Id: Ib45b71b826fec6aa0ffafc67c17735825634eae0
2016-12-28 16:22:16 -08:00
Tao Bao 0d3f84f237 updater: Update the header name for bootloader.h.
We should include "bootloader_message/bootloader_message.h" now.

Test: m updater
Change-Id: I65b22a8a0bcc5976ff1ba827bd30b46ee9d59c53
2016-12-28 15:09:20 -08:00
Tao Bao 7c09ac7e94 Merge "applypatch: Don't expose FindMatchingPatch()." am: b8d6523acf am: 29e1b7b4b2 am: 1b29658702
am: c0044e9f89

Change-Id: Ie84bc3179912a6111cfa0c37c5f14500dbbb7c5e
2016-12-28 22:39:58 +00:00