aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Always use strerror to report errno in recovery.Elliott Hughes2015-03-233-26/+27
| | | | Change-Id: I7009959043150fabf5853a43ee2448c7fbea176e
* Merge "Add "Apply update from sdcard" to default recovery image."Elliott Hughes2015-03-233-20/+44
|\
| * Add "Apply update from sdcard" to default recovery image.Elliott Hughes2015-03-223-20/+44
|/ | | | | | | | | | | | | | | | | | | | | At the moment, this is the only difference in the sprout recovery image. That's silly. Let's just improve the error handling slightly and always have this option present. Also make the obscure "<3e>" less unclear. Also use "power button" as the default text rather than "enter button", because it's been years since anyone had one of those. (Longer term we should let subclassers tell us the keycode and we translate it to the correct string.) Also move the two "Reboot" options together, put "Power off" at the bottom (and use that terminology, like the real UI, rather than "Power down"), and use capitals throughout. Finally, add a README.md with some useful instructions. Change-Id: I94fb19f73d79c54fed2dda30cefb884426641b5c
* Merge "Remove unused libutils references."Dan Albert2015-03-142-2/+1
|\
| * Remove unused libutils references.Dan Albert2015-03-132-2/+1
|/ | | | Change-Id: I22797643103ce1d4371198433ad9849cc83d3d7c
* am d5369e5d: (-s ours) am 18f371d8: updater: Check the return value from ↵Tao Bao2015-03-120-0/+0
|\ | | | | | | | | | | | | ApplyImagePatch / ApplyBSDiffPatch * commit 'd5369e5d91c9c7c55cbd8f1c306098182c209baf': updater: Check the return value from ApplyImagePatch / ApplyBSDiffPatch
| * am 18f371d8: updater: Check the return value from ApplyImagePatch / ↵Tao Bao2015-03-112-14/+29
| |\ | | | | | | | | | | | | | | | | | | ApplyBSDiffPatch * commit '18f371d814b26132aadf11de6cc305f02484535a': updater: Check the return value from ApplyImagePatch / ApplyBSDiffPatch
| | * updater: Check the return value from ApplyImagePatch / ApplyBSDiffPatchTao Bao2015-03-112-14/+29
| | | | | | | | | | | | | | | | | | | | | Return NULL to abort the update process. Note that returning "" won't stop the script. Change-Id: Ifd108c1356f7c92a905c8776247a8842c6445319
* | | am cc368fde: am 8290aa50: Merge "Install the recovery binary directly to the ↵Ying Wang2015-03-120-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | recovery image." * commit 'cc368fdea6e5415be541dadfe04107b76a82c537': Install the recovery binary directly to the recovery image.
| * | am 8290aa50: Merge "Install the recovery binary directly to the recovery image."Ying Wang2015-03-111-5/+1
| |\ \ | | | | | | | | | | | | | | | | * commit '8290aa501f1b0354262c304962bc4da2e30457a8': Install the recovery binary directly to the recovery image.
| | * \ Merge "Install the recovery binary directly to the recovery image."Ying Wang2015-03-111-5/+1
| | |\ \
| | | * | Install the recovery binary directly to the recovery image.Ying Wang2015-03-111-5/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This eliminated the previous hack, that doesn't work reliably with the "LOCAL_REQUIRED_MODULES := mkfs.f2fs". Bug: 19666886 Change-Id: I1f0a2d41129f402c0165f3b86b6fda077291f282
* | | | Install the recovery binary directly to the recovery image.Ying Wang2015-03-101-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This eliminated the previous hack, that doesn't work reliably with the "LOCAL_REQUIRED_MODULES := mkfs.f2fs". Bug: 19666886 Change-Id: I1f0a2d41129f402c0165f3b86b6fda077291f282
* | | | am fb7d8965: am 023e4374: am 579b9299: (-s ours) Merge "Remove more dead ↵Narayan Kamath2015-02-270-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | code from minzip." * commit 'fb7d896595d1fefe0b73bbebb1e4a0c027e4fab7': Remove more dead code from minzip.
| * | | am 023e4374: am 579b9299: (-s ours) Merge "Remove more dead code from minzip."Narayan Kamath2015-02-270-0/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '023e4374469b8cae68783036b6977ea721c1e07a': Remove more dead code from minzip.
| | * | am 579b9299: (-s ours) Merge "Remove more dead code from minzip."Narayan Kamath2015-02-270-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit '579b92991ccd626527c75042aca032d3ac4207a2': Remove more dead code from minzip.
| | | * \ Merge "Remove more dead code from minzip."Narayan Kamath2015-02-273-108/+59
| | | |\ \
| | | | * | Remove more dead code from minzip.Narayan Kamath2015-02-273-108/+59
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've added explanatory comments to mzExtractRecursive because that function will live on as a utility even after we move the zip format related logic to libziparchive. bug: 19472796 Change-Id: Id69db859b9b90c13429134d40ba72c1d7c17aa8e
* | | | | am 66f94728: am 3deba524: am ecead276: Merge "Add tests for read_block_adb."Dan Albert2015-02-274-16/+124
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '66f94728ef2f4ac09c42c4623ec45d5eac6e9d53': Add tests for read_block_adb.
| * | | | am 3deba524: am ecead276: Merge "Add tests for read_block_adb."Dan Albert2015-02-274-16/+124
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '3deba524f9d1e94b613d9c13f4c76595f0ec99ab': Add tests for read_block_adb.
| | * | | am ecead276: Merge "Add tests for read_block_adb."Dan Albert2015-02-274-16/+124
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit 'ecead276f068cb53bddb2458b200aa96473ddfb3': Add tests for read_block_adb.
| | | * | Merge "Add tests for read_block_adb."Dan Albert2015-02-274-16/+124
| | | |\ \
| | | | * | Add tests for read_block_adb.Dan Albert2015-02-264-16/+124
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These tests aren't completely representative in that they don't run in the recovery image. We might want to look in to adding a self-test option to the recovery UI. Until then, these can be run on a normal device (which is easier to do anyway). Bug: 19522788 Change-Id: Idb20feb55d10c62905c2480ab1b61a2e4b5f60d8
* | | | | Remove more dead code from minzip.Narayan Kamath2015-02-273-114/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've added explanatory comments to mzExtractRecursive because that function will live on as a utility even after we move the zip format related logic to libziparchive. bug: 19472796 (cherry-picked from commit c9ccdfd7a42de08c47ab771b94dc5b9d1f957b95) Change-Id: I8b7fb6fa3eafb2e7ac080ef7a7eceb691b252d8a
* | | | | am 0257d107: am 71c45429: am f66bf339: am 3e91f691: Bump up max_map_count value.Jesse Zhao2015-02-270-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '0257d107f2039e24e4fbdd98d7536f402628bd78': Bump up max_map_count value.
| * | | | am 71c45429: am f66bf339: am 3e91f691: Bump up max_map_count value.Jesse Zhao2015-02-260-0/+0
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | * commit '71c454293118c51487a62c5d7c4da6262eae691c': Bump up max_map_count value.
| | * | | am f66bf339: am 3e91f691: Bump up max_map_count value.Jesse Zhao2015-02-260-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f66bf33956eebba26bedc7f098dedc8a2c1cf942': Bump up max_map_count value.
| | | * \ \ am 3e91f691: Bump up max_map_count value.Jesse Zhao2015-02-261-0/+1
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3e91f691a6bf6b154ea98982b073e84e86328baf': Bump up max_map_count value.
| | | | * | | Bump up max_map_count value.Jesse Zhao2015-02-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id3e2c0795b817db9a85bc84cba2aa05d20179d39 Bug: 18503789 (cherry picked from commit 5bf74b238b402eaaf8c5bd1663fe4d592e59421f)
* | | | | | | am 9b14c4b0: am 735a0f0f: am cab0beb9: Merge "This read accidentally got ↵Dan Albert2015-02-261-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | turned in to a write." * commit '9b14c4b0e8b8b102c699b554d701e461e7e562e7': This read accidentally got turned in to a write.
| * | | | | | am 735a0f0f: am cab0beb9: Merge "This read accidentally got turned in to a ↵Dan Albert2015-02-261-1/+1
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | write." * commit '735a0f0fc3de936db3ce5a99dbcf02e970d47ba0': This read accidentally got turned in to a write.
| | * | | | | am cab0beb9: Merge "This read accidentally got turned in to a write."Dan Albert2015-02-261-1/+1
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | * commit 'cab0beb95adce79b0c33488b5a503cac7dca6e77': This read accidentally got turned in to a write.
| | | * | | | Merge "This read accidentally got turned in to a write."Dan Albert2015-02-261-1/+1
| | | |\ \ \ \
| | | | * | | | This read accidentally got turned in to a write.Dan Albert2015-02-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Too many mechanical changes in a row... Bug: 19522788 Change-Id: Ic451792aab2700cdbdbb64529b99ff5f567918ad
* | | | | | | | am d9bbeaec: am 83e5d1dc: am c9bc3cc9: Merge "Drop hardcoded ↵Narayan Kamath2015-02-261-4/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LOCAL_C_INCLUDES from minui/Android.mk" * commit 'd9bbeaec5a12074928f026af47de2b92f2a34336': Drop hardcoded LOCAL_C_INCLUDES from minui/Android.mk
| * | | | | | | am 83e5d1dc: am c9bc3cc9: Merge "Drop hardcoded LOCAL_C_INCLUDES from ↵Narayan Kamath2015-02-261-4/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | minui/Android.mk" * commit '83e5d1dc73116a154cd7387547c8dd858fd497aa': Drop hardcoded LOCAL_C_INCLUDES from minui/Android.mk
| | * | | | | | am c9bc3cc9: Merge "Drop hardcoded LOCAL_C_INCLUDES from minui/Android.mk"Narayan Kamath2015-02-261-4/+1
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c9bc3cc92a2c2f584b28049238c4a583c80f149d': Drop hardcoded LOCAL_C_INCLUDES from minui/Android.mk
| | | * | | | | Merge "Drop hardcoded LOCAL_C_INCLUDES from minui/Android.mk"Narayan Kamath2015-02-261-4/+1
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | | * | | | Drop hardcoded LOCAL_C_INCLUDES from minui/Android.mkTrevor Drake2015-02-261-4/+1
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The zlib include was not required. libpng is now handled by referencing the libpng static library Change-Id: Ie4e0abad3fff5b763eba363d3d0fa96128ff49bc
* | | | | | | am 381f6416: am eef962bf: am 9255ad4a: Merge "Fix readx/writex names."Dan Albert2015-02-251-4/+6
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '381f64165153bfd4747b99baf838fa280d402d5e': Fix readx/writex names.
| * | | | | | am eef962bf: am 9255ad4a: Merge "Fix readx/writex names."Dan Albert2015-02-251-4/+6
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'eef962bfd90f11ef2f936e57270c85293af60e5f': Fix readx/writex names.
| | * | | | | am 9255ad4a: Merge "Fix readx/writex names."Dan Albert2015-02-251-4/+6
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit '9255ad4a4f46dc7781b180d0cffce2d616adebcf': Fix readx/writex names.
| | | * | | | Merge "Fix readx/writex names."Dan Albert2015-02-251-4/+6
| | | |\ \ \ \
| | | | * | | | Fix readx/writex names.Dan Albert2015-02-251-4/+6
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I9556960b8293ea0e81def8b73f88edadb68841e3
* | | | | | | am 94cb7fdc: am d795dcc5: am 12fa5191: Merge "Remove _(GNU|XOPEN)_SORUCE ↵Dan Albert2015-02-251-2/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | makefile cruft." * commit '94cb7fdc45db013c0ad6b8edc536717c6eb812a8': Remove _(GNU|XOPEN)_SORUCE makefile cruft.
| * | | | | | am d795dcc5: am 12fa5191: Merge "Remove _(GNU|XOPEN)_SORUCE makefile cruft."Dan Albert2015-02-251-2/+0
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'd795dcc5ead7328c1b3fcb14e279c4bec6a38b50': Remove _(GNU|XOPEN)_SORUCE makefile cruft.
| | * | | | | am 12fa5191: Merge "Remove _(GNU|XOPEN)_SORUCE makefile cruft."Dan Albert2015-02-251-2/+0
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit '12fa5191e76d119f4f3998a4b8821f87aa4f9fad': Remove _(GNU|XOPEN)_SORUCE makefile cruft.
| | | * | | | Merge "Remove _(GNU|XOPEN)_SORUCE makefile cruft."Dan Albert2015-02-251-2/+0
| | | |\ \ \ \
| | | | * | | | Remove _(GNU|XOPEN)_SORUCE makefile cruft.Dan Albert2015-02-241-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | None of the functions needing these are used. Change-Id: Ibe3ca24d993788bf2f1108bac8417a7094ef386b
* | | | | | | | am 07d2542d: am b3f4ed86: am 82eea3fd: Merge "Fix LP64 build for minadbd."Narayan Kamath2015-02-251-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '07d2542d870d4bb92c9cfb85bd0ac8f9bf7ba4c4': Fix LP64 build for minadbd.
generated by cgit v1.1 at 2024-12-23 08:44:46 +0000