aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-10-28Merge "recovery: Depend on mkfs.f2fs only if needed."brillo-m7-releasebrillo-m7-mr-devbrillo-m7-devTao Bao
2015-10-27recovery: Depend on mkfs.f2fs only if needed.Tao Bao
Don't build mkfs.f2fs unless device defines TARGET_USERIMAGES_USE_F2FS. Change-Id: Ifac592c30315bbe7590c8fbf3a0844e6a7a31a1a
2015-10-23Merge "updater: Bump up the BBOTA version to 4."Tao Bao
2015-10-22updater: Bump up the BBOTA version to 4.Tao Bao
To accommodate new changes in N release, such as error correction [1] and other potential changes to the updater. [1]: commit 0a7b47397db3648afe6f3aeb2abb175934c2cbca Change-Id: I4dd44417d07dd0a31729894628635a0aa1659008
2015-10-19Merge "Error correction: Use libfec in blockimg.cpp for recovery"Sami Tolvanen
2015-10-19Error correction: Use libfec in blockimg.cpp for recoverySami Tolvanen
Add block_image_recover function to rewrite corrupted blocks on the partition. This can be attempted if block_image_verify fails. Note that we cannot use libfec during block_image_update as it may overwrite blocks required for error correction. A separate recovery pass in case the image is corrupted is the only viable option. Bug: 21893453 Change-Id: I6ff25648fff68d5f50b41a601c95c509d1cc5bce
2015-09-30am 754ebaa9: Merge "updater: Skip empty lines in the transfer list file."Tao Bao
* commit '754ebaa90a3e11012e2456013e69b34a30272c4a': updater: Skip empty lines in the transfer list file.
2015-09-30Merge "updater: Skip empty lines in the transfer list file."Tao Bao
2015-09-30am 4b66a280: Merge "minadbd: use strdup() to create argument for sideload ↵Yabin Cui
thread." * commit '4b66a280d314ab5aeb5027fe5b0023ae1f25ecca': minadbd: use strdup() to create argument for sideload thread.
2015-09-30Merge "minadbd: use strdup() to create argument for sideload thread."Yabin Cui
2015-09-29minadbd: use strdup() to create argument for sideload thread.Yabin Cui
So sideload thread will not use argument which is to be freed in the main thread. Bug: 23968770 Change-Id: I9d6dadc6c33cfbe4b5759382a80fe14cd0d54355
2015-09-25updater: Skip empty lines in the transfer list file.Tao Bao
We have the last line being empty as a result of android::base::Split("a\nb\n"), which leads to "missing command" warnings in the update. Just skip all the empty lines. Bug: 24373789 Change-Id: I5827e4600bd5cf0418d95477e4592fec47bbd3a9
2015-09-25am 2bdac629: Merge changes Ic769eafc,I63f28b3bTao Bao
* commit '2bdac629f1d109dc79370edec8a31e20fbbe384c': updater: Use android::base::ParseInt() to parse integers. Suppress some compiler warnings due to signedness.
2015-09-25Merge changes Ic769eafc,I63f28b3bTao Bao
* changes: updater: Use android::base::ParseInt() to parse integers. Suppress some compiler warnings due to signedness.
2015-09-24updater: Use android::base::ParseInt() to parse integers.Tao Bao
Change-Id: Ic769eafc8d9535b1d517d3dcbd398c3fd65cddd9
2015-09-24Suppress some compiler warnings due to signedness.Tao Bao
Change-Id: I63f28b3b4ba4185c23b972fc8f93517295b1672a
2015-09-23am 3317d501: Merge "minadbd: move from D() to VLOG()."Yabin Cui
* commit '3317d5017963684cdbf4573d6cc6c0ff4cee0869': minadbd: move from D() to VLOG().
2015-09-23Merge "minadbd: move from D() to VLOG()."Yabin Cui
2015-09-23minadbd: move from D() to VLOG().Yabin Cui
Change-Id: I542e2ae8f5ef18b2d6b3dbc1888b3ce1e02a7404
2015-09-18am b739a32b: Merge "recovery: Add timestamps in update logs."Tao Bao
* commit 'b739a32b7c32279da4d5ac55601f06bc5c81f1d5': recovery: Add timestamps in update logs.
2015-09-18Merge "recovery: Add timestamps in update logs."Tao Bao
2015-09-17recovery: Add timestamps in update logs.Tao Bao
Fork a logger process and send over the log lines through a pipe. Prepend a timestamp to each line for debugging purpose. Timestamps are relative to the start of the logger. Example lines with the change in this CL: [ 445.948393] Verifying update package... [ 446.279139] I:comment is 1738 bytes; signature 1720 bytes from end [ 449.463652] I:whole-file signature verified against RSA key 0 [ 449.463704] I:verify_file returned 0 Change-Id: I139d02ed8f2e944c1618c91d5cc43282efd50b99
2015-09-16am a42a322d: Merge "updater: Manage buffers with std::vector."Tao Bao
* commit 'a42a322d8f6de0157625b518d12d1919f1e0dd7e': updater: Manage buffers with std::vector.
2015-09-16Merge "updater: Manage buffers with std::vector."Tao Bao
2015-09-14am ee17242f: Merge "minadbd: update service_to_fd() signature."David Pursell
* commit 'ee17242f904730c759272b2576aafc59d764525b': minadbd: update service_to_fd() signature.
2015-09-14Merge "minadbd: update service_to_fd() signature."David Pursell
2015-09-12am b83fd518: Merge "recovery: Remove redirect_stdio() when calling ShowFile()."Tao Bao
* commit 'b83fd518262853d42b5a73a61ec6fdfafe0f5564': recovery: Remove redirect_stdio() when calling ShowFile().
2015-09-12Merge "recovery: Remove redirect_stdio() when calling ShowFile()."Tao Bao
2015-09-10recovery: Remove redirect_stdio() when calling ShowFile().Tao Bao
When calling ScreenRecoveryUI::ShowFile(), the only thing that gets inadequately logged is the progress bar. Replace the call to ScreenRecoveryUI::Print() with ScreenRecoveryUI::PrintOnScreenOnly() for the progress bar, so we can avoid calling redirect_stdio(). Change-Id: I4d7c5d5b39bebe0d5880a99d7a72cee4f0b8f325
2015-09-10am 7a677807: Merge "updater: Fix the line breaks in ui_print commands."Tao Bao
* commit '7a6778078b2525c245869061366eb1f92942542a': updater: Fix the line breaks in ui_print commands.
2015-09-10Merge "updater: Fix the line breaks in ui_print commands."Tao Bao
2015-09-10updater: Fix the line breaks in ui_print commands.Tao Bao
When processing ui_print commands in the updater, it misses a line break when printing to the recovery log. Also clean up uiPrintf() and UIPrintFn() with std::string's. Change-Id: Ie5dbbfbc40b024929887d3c3ccd3a334249a8c9d
2015-09-09updater: Manage buffers with std::vector.Tao Bao
Change-Id: Ide489e18dd8daf161b612f65b28921b61cdd8d8d
2015-09-09am e520f1d4: Merge "updater: Replace the pointers in ↵Tao Bao
LoadSrcTgtVersion[1-3]() parameter." * commit 'e520f1d4cddeca4208ccc385313d900581ff117c': updater: Replace the pointers in LoadSrcTgtVersion[1-3]() parameter.
2015-09-09Merge "updater: Replace the pointers in LoadSrcTgtVersion[1-3]() parameter."Tao Bao
2015-09-08updater: Replace the pointers in LoadSrcTgtVersion[1-3]() parameter.Tao Bao
And inline the call to LoadSrcTgtVersion1() into SaveStash(). Change-Id: Ibf4ef2bfa2cc62df59c4e8de99fd7d8039e71ecf
2015-09-08am 585a50ce: Merge "imgdiff: fix file descriptor leak"Tao Bao
* commit '585a50cecbccf59666dd65e9fc4320eaa3511634': imgdiff: fix file descriptor leak
2015-09-08Merge "imgdiff: fix file descriptor leak"Tao Bao
2015-09-08imgdiff: fix file descriptor leakJeremy Compostella
mkstemp() allocates a file description that is never released. If MakePatch() is called too many time, imgdiff reaches the Operating System EMFILE (too many open files) limit. Change-Id: Icbe1399f6f6d32cfa1830f879cacf7d75bbd9fc3 Signed-off-by: Jeremy Compostella <jeremy.compostella@intel.com> Signed-off-by: Gaelle Nassiet <gaellex.nassiet@intel.com>
2015-09-04am f8c303f9: Merge "move uncrypt from init.rc to uncrypt.rc"Tom Cherry
* commit 'f8c303f9c197ed9247dbc88a5bf392f1f2c65639': move uncrypt from init.rc to uncrypt.rc
2015-09-04Merge "move uncrypt from init.rc to uncrypt.rc"Tom Cherry
2015-09-03minadbd: update service_to_fd() signature.David Pursell
No functional change, just matching the signature to an adb change. See https://android-review.googlesource.com/#/c/169601/. Change-Id: Ic826864e126054849b3a4d193ded8acc5ee5269c
2015-09-03move uncrypt from init.rc to uncrypt.rcTom Cherry
Move uncrypt from /init.rc to /system/etc/init/uncrypt.rc using the LOCAL_INIT_RC mechanism Bug 23186545 Change-Id: Ib8cb6dffd2212f524298279787fd557bc84aa7b9
2015-09-03am 4c223f4e: Merge "Add slot_suffix field to struct bootloader_message."David Zeuthen
* commit '4c223f4e396e1b66a945601561fce4cd63fc31ae': Add slot_suffix field to struct bootloader_message.
2015-09-03Merge "Add slot_suffix field to struct bootloader_message."David Zeuthen
2015-09-03am 6997c287: Merge "updater: Clean up C codes."Tao Bao
* commit '6997c287bedbd32fb5ffb84fc2efd081e6f56d3e': updater: Clean up C codes.
2015-09-02Merge "updater: Clean up C codes."Tao Bao
2015-09-02Add slot_suffix field to struct bootloader_message.David Zeuthen
This is needed by fs_mgr for certain A/B implementations. Change-Id: I7bb404d61198eb7a962c2b693911f5156745daae
2015-09-01updater: Clean up C codes.Tao Bao
Replace C-string with std::string, pointers with references, and variable-size arrays in struct with std::vector. Change-Id: I57f361a0e58286cbcd113e9be225981da56721b2
2015-08-26am 5a16eba2: am eef99138: Merge "updater: Remove the unused isunresumable in ↵Tao Bao
SaveStash()." * commit '5a16eba2c323ecb4f1dd1ecb2ecea7a0ac8bdbb5': updater: Remove the unused isunresumable in SaveStash().