PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,159 Commits 1 Branch 0 Tags
deaf2662d7ba0ee4672d5cc2a4ff7a50108e8079
Commit Graph

7159 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Elliott Hughes 7a890e5cf5 Move to .md files for even trivial documentation. 
So it's automatically displayed for folks browsing the source.

Bug: N/A
Test: N/A
Change-Id: Ie9b190072ebdf0faf06cc1fd7b3467c031056753
 2017-01-07 12:49:32 -08:00
Tianjie Xu 8ff296be1a Merge "Retry ioctl in uncrypt if it returns block# 0" am: ceafe69fb8 am: 06b4254a70 am: 5ec75851a7 
am: 4536c470f8

Change-Id: I399f35a1bc1575f9e1fcfa5d2bb537390360505e
 2017-01-07 01:28:03 +00:00
Tianjie Xu 4536c470f8 Merge "Retry ioctl in uncrypt if it returns block# 0" am: ceafe69fb8 am: 06b4254a70 
am: 5ec75851a7

Change-Id: I8fc9a1e148b4b8088a2cd38ef04817c8c5ad99aa
 2017-01-07 01:24:03 +00: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
Tianjie Xu a78b2d2256 Update background text images in recovery 
Locale texts are missing in the recovery log due to an extra empty
locale chunk in the png file. Fix the bug in the app and regenerate all
the background texts and compress the file with pngcrush + zopflipng.

Bug: 34054052
Test: Locale texts logged successfully on angler
Change-Id: I89f823a53c1eb69756183e8e11113216d093304f
 2017-01-07 00:32:40 +00:00
Tao Bao 488d7a15f0 Merge "recovery: Clean up try_update_binary() in install.cpp." am: 095675a3eb am: 1bbd9c68af am: af53db6ba0 
am: 31f4bb5a2c

Change-Id: Id89a420a1a5ddd4c8d497fe34517b9ed1fb267f9
 2017-01-06 19:25:07 +00:00
Tao Bao 31f4bb5a2c Merge "recovery: Clean up try_update_binary() in install.cpp." am: 095675a3eb am: 1bbd9c68af 
am: af53db6ba0

Change-Id: I2b069e20650758513687a90c4341d2168016b331
 2017-01-06 19:21:36 +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 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 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 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