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

3191 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tao Bao b7ce9c5e00 Merge "recovery: Fix the argument parsing." am: 33808f16c5 
am: fe0a80184c

Change-Id: Id077e40e0fa27fb94fee942e95430eb02c369333
 2017-01-09 21:40:39 +00:00
Tao Bao fe0a80184c Merge "recovery: Fix the argument parsing." 
am: 33808f16c5

Change-Id: I9ae6633598262f21cca63f90cd51f6b84e5fead2
 2017-01-09 21:35:39 +00:00
Tao Bao 33808f16c5 Merge "recovery: Fix the argument parsing." 2017-01-09 21:28:19 +00:00
Tao Bao 570af9dca3 recovery: Fix the argument parsing. 
Commit f0ed159f48 unintentionally changed
the behavior when parsing the arguments from BCB and command file. It
should only parse the command file for arguments if BCB doesn't supply
any.

As a result, it shows the following from the log:
I:Got 2 arguments from boot message
I:Got 3 arguments from /cache/recovery/command

Test: Set arguments in BCB and command file both. It should only use the
      arguments from BCB.

Change-Id: Idf371137aa9177f1b2dfdfecf0c9f46959d2ee76
 2017-01-09 10:35:42 -08:00
Tianjie Xu 5ec75851a7 Merge "Retry ioctl in uncrypt if it returns block# 0" am: ceafe69fb8 
am: 06b4254a70

Change-Id: I09e0b59a433533c84f251a8c32c663a1ca8a8d3b
 2017-01-07 01:20:05 +00:00
Tianjie Xu 06b4254a70 Merge "Retry ioctl in uncrypt if it returns block# 0" 
am: ceafe69fb8

Change-Id: I5fa4c97672520c2ec47e2bbb55b55c5f54417dc7
 2017-01-07 01:16:02 +00:00
Tianjie Xu ceafe69fb8 Merge "Retry ioctl in uncrypt if it returns block# 0" 2017-01-07 01:11:13 +00:00
Tao Bao af53db6ba0 Merge "recovery: Clean up try_update_binary() in install.cpp." am: 095675a3eb 
am: 1bbd9c68af

Change-Id: Ia502cd3e40fb02ed01e3e91fd0892f952083b1fa
 2017-01-06 19:17:37 +00:00
Tao Bao 1bbd9c68af Merge "recovery: Clean up try_update_binary() in install.cpp." 
am: 095675a3eb

Change-Id: I2fd17d43068359095746c885c0f3c0605eac232e
 2017-01-06 19:13:37 +00:00
Treehugger Robot 095675a3eb Merge "recovery: Clean up try_update_binary() in install.cpp." 2017-01-06 19:07:59 +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 20c581e35d recovery: Clean up try_update_binary() in install.cpp. 
Move functions over to android::base versions.
- strtok(3) => android::base::Split()
- strtol(3) => android::base::ParseInt()
- strtof(3) => android::base::ParseDouble()

Test: Build recovery image and apply a package that calls ui_print /
      progress / set_progress commands.
Change-Id: I953b4985e0bd9e277362ae53e233d755cf27d80c
 2017-01-06 09:25:32 -08: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 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 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 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
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 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 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 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 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 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