PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,263 Commits 1 Branch 0 Tags
bcde135fce7234bbf78ac2c3159df9dd1cf4bd1d
Commit Graph

3263 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
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
Tao Bao 1227f6b841 Merge "recovery: Fix the broken UI text." 
am: 56fc8fa376

Change-Id: If83e5bf3b79fd753ad87ea8223ed59883dfcfafe
 2017-01-04 19:17:47 +00: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 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 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 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 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 c0044e9f89 Merge "applypatch: Don't expose FindMatchingPatch()." am: b8d6523acf am: 29e1b7b4b2 
am: 1b29658702

Change-Id: I5b20f06908d34b0eba9b27b72cc686a57b52aa11
 2016-12-28 22:32:28 +00:00
Tao Bao d37ce8f082 imgdiff: Fix an edge case that leads to infinite loop. 
When the input image ends with the magic value sequence of 0x1f, 0x8b,
0x0b (optionally with 0x00), the image parsing code will be stuck in an
infinite loop.

Test: recovery_component_test passes.
Change-Id: Ie3629dfdc41360387b19cc3e0359c95ae4fb998e
 2016-12-28 14:29:48 -08:00
Tao Bao 1b29658702 Merge "applypatch: Don't expose FindMatchingPatch()." am: b8d6523acf 
am: 29e1b7b4b2

Change-Id: Ica4a7e02c1939065c404f9789941ee9206611643
 2016-12-28 22:24:27 +00:00
Tao Bao 29e1b7b4b2 Merge "applypatch: Don't expose FindMatchingPatch()." 
am: b8d6523acf

Change-Id: I4a1c4962ee9d78002898b678d88458f323ef5454
 2016-12-28 22:16:56 +00:00
Tao Bao b8d6523acf Merge "applypatch: Don't expose FindMatchingPatch()." 2016-12-28 22:11:49 +00:00
Tao Bao e6c1d578bd Merge "Add tests for imgdiff." am: 344c8eb453 am: 4fe022c4ed 
am: 4e2471d6dd

Change-Id: I2bad2ab0bf7a4ff180b14dc772adc66e43b5406e
 2016-12-28 18:25:42 +00:00
Tao Bao 4e2471d6dd Merge "Add tests for imgdiff." am: 344c8eb453 
am: 4fe022c4ed

Change-Id: I80d978c69b389089b9b47aa8170ab5041099ad94
 2016-12-28 18:18:42 +00:00
Tao Bao c8e79340e4 applypatch: Don't expose FindMatchingPatch(). 
Test: make
Change-Id: Ic77c4669574b6129e06aa6051804f419bcc8196c
 2016-12-28 10:11:22 -08:00
Tao Bao 4fe022c4ed Merge "Add tests for imgdiff." 
am: 344c8eb453

Change-Id: Iad8cb5e7ef3e3a09c305913a1367af8585d59529
 2016-12-28 18:11:11 +00:00
Tao Bao 344c8eb453 Merge "Add tests for imgdiff." 2016-12-28 18:05:45 +00:00
Tao Bao f9d1e205eb Merge "tests: Add test coverage for DirUtil." am: f24d2a6b39 am: 1b83e7e28d 
am: 7f0f49dd2b

Change-Id: I2f4dbbb375894fe8695f99718401f2fcc457adb0
 2016-12-23 17:42:13 +00:00
Tao Bao 7f0f49dd2b Merge "tests: Add test coverage for DirUtil." am: f24d2a6b39 
am: 1b83e7e28d

Change-Id: I630381834ee21d5495859b82707c2c7b4560d97e
 2016-12-23 17:36:12 +00:00
Tao Bao 1b83e7e28d Merge "tests: Add test coverage for DirUtil." 
am: f24d2a6b39

Change-Id: I624cb64464427d06d2711f3b88ec94cd93ac06d3
 2016-12-23 17:30:12 +00:00
Tao Bao f24d2a6b39 Merge "tests: Add test coverage for DirUtil." 2016-12-23 17:22:51 +00:00
Tao Bao f19295c5dc tests: Add test coverage for DirUtil. 
Test: recovery_unit_test passes.
Change-Id: I764c56404c7ccdd57ae5486c946fbc9ac6ae7bc9
 2016-12-22 09:57:49 -08:00
Tao Bao 5a108b6e00 Merge "tests: Replace the O_RDONLY in access(2)." am: 3b9645288e am: baf422229d 
am: ef801f9a62

Change-Id: If7d21904a9db6a73a0498d500c12014d9bf1bfcb
 2016-12-22 17:33:33 +00:00
Tao Bao 7720e1ab48 Merge "tests: Add testcase for ZipUtil." am: aa305e9ce8 am: 6df1c4579e 
am: 830ab1c482

Change-Id: I253e34414b8fb4be173307ec0dabedb9c7f35380
 2016-12-22 17:33:23 +00:00
Tao Bao ef801f9a62 Merge "tests: Replace the O_RDONLY in access(2)." am: 3b9645288e 
am: baf422229d

Change-Id: I444696a344f8b37b852469e36b7cc6a925c9fc80
 2016-12-22 17:28:33 +00:00
Tao Bao 830ab1c482 Merge "tests: Add testcase for ZipUtil." am: aa305e9ce8 
am: 6df1c4579e

Change-Id: I7bcce5428e32bbae889e999bce18c091f552136d
 2016-12-22 17:28:23 +00:00
Tao Bao baf422229d Merge "tests: Replace the O_RDONLY in access(2)." 
am: 3b9645288e

Change-Id: Ib06f7298797ccd3f945542ecdd5366fb8e8eba6c
 2016-12-22 17:23:04 +00:00
Tao Bao 6df1c4579e Merge "tests: Add testcase for ZipUtil." 
am: aa305e9ce8

Change-Id: Id12e27ac3db4bcee6aa9de86867f05942cee3645
 2016-12-22 17:22:53 +00:00