| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| | |
Merge commit '17986e6b8766ef9bdaa49efc7099e3867ca1978a' into gingerbread-plus-aosp
* commit '17986e6b8766ef9bdaa49efc7099e3867ca1978a':
fix bug in applying patches
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | | |
Merge commit '8cd9e4f3d4eba481b411482331293c8079ab24b2' into gingerbread
* commit '8cd9e4f3d4eba481b411482331293c8079ab24b2':
fix bug in applying patches
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When restarting a patch from crashing in the middle of a large file,
we're not finding the correct patch to apply to the copy saved in
cache.
Change-Id: I41cb2b87d096bb7a28a10c4cf3902facd45d4c9d
|
| |\| |
| | |
| | |
| | |
| | |
| | |
| | | |
Merge commit '23ceeea85e6a3555dd3d7140128e310954cadf7f' into gingerbread-plus-aosp
* commit '23ceeea85e6a3555dd3d7140128e310954cadf7f':
make a copy of sideloaded packages in /tmp before verifying
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Copy a sideloaded package into /tmp, then verify and install the copy,
to prevent malicious users from overwriting the package between
verification and install.
Bug: 2826890 package can be replaced during verification
Bug: 2058160 Recovery should copy sideloaded (sd card) update ...
Change-Id: I3de148b0f1a671f1974782b6855527caeaefda23
|
| |\ \ \
| |/ /
|/| |
| | | |
Change-Id: I9d0122dbf1a9c2bd1898c41766c5bf4320f2313a
|
| | |\|
| | |
| | |
| | |
| | |
| | |
| | | |
Merge commit 'ecc76ba5516d62a886f9c290906e0ca50702c9ab' into froyo-plus-aosp
* commit 'ecc76ba5516d62a886f9c290906e0ca50702c9ab':
Set adbd to be disabled by default in recovery
|
| |\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | | |
Merge commit 'ecc76ba5516d62a886f9c290906e0ca50702c9ab' into gingerbread
* commit 'ecc76ba5516d62a886f9c290906e0ca50702c9ab':
Set adbd to be disabled by default in recovery
|
| | | |
| | |
| | |
| | | |
Change-Id: I74fa6edc4b001247b20be52e8301d18407fede2c
|
| | | |
| | |
| | |
| | |
| | |
| | | |
Fix potential string format bug.
Change-Id: Ie05aac53b2c45a48bd68e340b76ccb21edfd28b7
|
| | | |
| | |
| | |
| | | |
Change-Id: Iad448bc1608f88c5db2108475f35b88ea2877b07
|
| |\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | | |
Merge commit '97ca48e7f4ac8d3842f74f92b8f40d0e74733f38' into kraken
* commit '97ca48e7f4ac8d3842f74f92b8f40d0e74733f38':
generic_x86 support
|
| | |/
| |
| |
| |
| |
| |
| |
| |
| | |
Add in Makefiles and support files for x86 builds
Based on changes by: wonjong.lee <wonjong.lee@windriver.com>
Additional changes by: Mark Gross <mark.gross@intel.com>
Additional changes by: Bruce Beare <brucex.j.beare@intel.com>
Change-Id: I71fcf58f116e4e9047e7d03fdb28e3308553ce5c
|
| | |
| |
| |
| |
| |
| | |
Encrypted File Systems integration. Recovery changes.
Change-Id: I932f73a6f937aac061128e1134eab08c30f0471d
|
| |\|
| |
| |
| |
| |
| |
| | |
Merge commit '2654f5aae18c67ad9aff6dbcdf9bc67b62e37d2d' into kraken
* commit '2654f5aae18c67ad9aff6dbcdf9bc67b62e37d2d':
DO NOT MERGE
|
| |/
|
|
|
|
|
| |
Removing unused recovey options.
Please refer to Bug#2502219 for more info.
Change-Id: I2fe3cdb0c8b93ed7e1cc4093824fbe181f5f0aea
|
| |
|
|
| |
Change-Id: Icd177bd26120e0c8929faa8d1007f6c5bd446cb8
|
| |
|
|
|
|
|
| |
The docs say "don't do this", but it's trivial to make safe. Make
StringValue(NULL) return NULL instead of crashing.
Change-Id: I2221bcb4c98d8adb4e25c764d7bdcfa787822bcf
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Change the applypatch function to take meaningful arguments instead of
argc and argv. Move all the parsing of arguments into main.c (for the
standalone binary) and into install.c (for the updater function).
applypatch() takes patches as Value objects, so we can pass in blobs
extracted from the package without ever writing them to temp files.
The patching code is changed to read the patch from memory instead of
a file.
A bunch of compiler warnings (mostly about signed vs unsigned types)
are fixed.
Support for the IMGDIFF1 format is dropped. (We've been generating
IMGDIFF2 packages for some time now.)
Change-Id: I217563c500012750f27110db821928a06211323f
|
| |
|
|
| |
Change-Id: Id2712940c4929f3a8b3ba5d4e9e03bb8034747ee
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Move applypatch to this package (from build).
- Add a rudimentary type system to edify: instead of just returning a
char*, functions now return a Value*, which is a struct that can
carry different types of value (currently just STRING and BLOB).
Convert all functions to this new scheme.
- Change the one-argument form of package_extract_file to return a
Value of the new BLOB type.
- Add read_file() to load a local file and return a blob, and
sha1_check() to test a blob (or string) against a set of possible
sha1s. read_file() uses the file-loading code from applypatch so it
can read MTD partitions as well.
This is the start of better integration between applypatch and the
rest of edify.
b/2361316 - VZW Issue PP628: Continuous reset to Droid logo:
framework-res.apk update failed (CR LIBtt59130)
Change-Id: Ibd038074749a4d515de1f115c498c6c589ee91e5
|
| |
|
|
|
|
|
| |
Make sure file is valid before we try to read it. Also free all the
strings we allocate in various functions so we don't leak memory.
Change-Id: Ica3c8dae992e73718c79c12ff5d7e315c290caea
|
| |\
| |
| |
| |
| |
| |
| | |
Merge commit 'da846fcf1b6a7bbd2f9f30c965b25f084568ef75'
* commit 'da846fcf1b6a7bbd2f9f30c965b25f084568ef75':
android-2.1_r1 snapshot
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | | |
Merge commit '4c382b13657be5d949e7dfc9ef46a66f2eb496e0' into eclair-plus-aosp
* commit '4c382b13657be5d949e7dfc9ef46a66f2eb496e0':
android-2.1_r1 snapshot
|
| | | |\ |
|
| | | | |\ |
|
| | | | | | |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Remove support for the HTC-specific "firmware" update command and the
corresponding edify function write_firmware_update(). This
functionality is now done by an edify extension library that lives in
vendor/htc.
Change-Id: I80858951ff10ed8dfff98aefb796bef009e05efb
|
| |\ \ \ \ \ |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Remove (or at least stop calling) the HTC-specific mechanism for
preserving the recovery log from before a radio or hboot update.
Replace it with a generic device_recovery_start() function which each
device's code can implement to do whatever it wants on recovery
startup.
Change-Id: If3cca4b498c0b1cf0565236404ecf56a1fc46123
|
| |/ / / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Add a version of package_extract_file that returns the file data as
its return value (to be consumed by some other edify function that
expects to receive a bunch of binary data as an argument). Lets us
avoid having two copies of a big file in memory (extracting it into
/tmp, which is a ramdisk, and then having something load it into
memory) when doing things like radio updates.
Change-Id: Ie26ece5fbae457eb0ddcd8a13d74d78a769fbc70
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
%i can't be used to read unsigned ints (though it happens to work with
bionic). Change to %x and %u as appropriate.
Change-Id: I8ea9ca16a939501757cf70fc5953abee26c8231c
http://b/2402231 - Parser for /res/keys interprets n0inv as a signed int
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
When doing a firmware (radio or hboot) update on HTC devices, save the
recovery log in block 1 of the cache partition, before the firmware
image and the UI bitmaps. When we boot back into recovery after the
firmware update to reformat the cache partition, copy that log out of
cache before reformatting it and dump it into the current invocation's
log.
The practical upshot of all this is that we can see the log output
from radio and hboot updates.
Change-Id: Ie0e89566754c88f4bed6a90d8a0aa04047b01a27
|
| |\| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Merge commit '4e9332cb0bb84df4c08bbb469e59a54eab2a9df0'
* commit '4e9332cb0bb84df4c08bbb469e59a54eab2a9df0':
make offsets in firmware update header not point to bad blocks
|
| | |\| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Merge commit '22d79a5c5eab9c1e86ff2af210bb072689e2d630' into eclair-plus-aosp
* commit '22d79a5c5eab9c1e86ff2af210bb072689e2d630':
make offsets in firmware update header not point to bad blocks
|
| | | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
(This is being cherry-picked from master.)
hboot will apparently fail to install if the first block of the image
(the one pointed to by the offset in the block 0 header) is a bad
block. (Hopefully it handles subsequent bad blocks.)
This change makes the MTD write code keep track of the bad blocks it
has skipped over, so that the offset in the header can be adjusted to
be the address of the first successfully written block.
http://b/2358012 - passion: failure to flash hboot (bad blocks?)
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
hboot will apparently fail to install if the first block of the image
(the one pointed to by the offset in the block 0 header) is a bad
block. (Hopefully it handles subsequent bad blocks.)
This change makes the MTD write code keep track of the bad blocks it
has skipped over, so that the offset in the header can be adjusted to
be the address of the first successfully written block.
Change-Id: I45d58e32a36d0c1dbc0a7f871bd5985b6c8ff524
http://b/2358012 - passion: failure to flash hboot (bad blocks?)
|
| |\| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Merge commit '158657bc5ce438d3cf1f601255896b854fd49103'
* commit '158657bc5ce438d3cf1f601255896b854fd49103':
Security: Fix typo in recovery EOCD detection.
|
| | |\ \ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This issue results in the ability to modify the contents of a signed
OTA recovery image.
|
| |\| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Merge commit 'd36308c26d3f2947f4ff49f2ecc22cbb659fdf37'
* commit 'd36308c26d3f2947f4ff49f2ecc22cbb659fdf37':
use MEMGETBADBLOCK to look for bad blocks when reading MTD partitions
|
| | |\ \ \ \
| | | |/ /
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | | |
Merge commit '17a47098d2a4214397f8b30e2692c9487d7ab5ff' into eclair-plus-aosp
* commit '17a47098d2a4214397f8b30e2692c9487d7ab5ff':
use MEMGETBADBLOCK to look for bad blocks when reading MTD partitions
|
| | | | | | |
|
| |\| | | | |
|
| | |\| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Merge commit 'c652e41d9173e299a8e1805ae1b2bba75a34ae12' into eclair-plus-aosp
* commit 'c652e41d9173e299a8e1805ae1b2bba75a34ae12':
fix cut-and-paste error in verifier
|
| |\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Merge commit '9b430e11d6c4fb907d0aa96667142e2c00585e09'
* commit '9b430e11d6c4fb907d0aa96667142e2c00585e09':
add a simple unit test for the OTA package verifier
|
| | |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Merge commit '73ae31ce0ac09c0e45924d817644261c87ab1a60' into eclair-mr2-plus-aosp
* commit '73ae31ce0ac09c0e45924d817644261c87ab1a60':
add a simple unit test for the OTA package verifier
|
| | | | | | | | |
|
| |\ \ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* changes:
Recovery changes for Encrypted File Systems. This change enables/disables the Encrypted file systems feature. It reads some properties form the data partition, wipes the partition out, and then rewrites the proper properties again into the data partition to signal that encrypted FS are enabled.
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
This change enables/disables the Encrypted file systems feature. It reads some properties form the data partition, wipes the partition out, and then rewrites the proper properties again into the data partition to signal that encrypted FS are enabled.
|
| |\ \ \ \ \ \ \ \
| |/ / / / / / /
|/| / / / / / /
| |/ / / / / /
| | | | | | |
| | | | | | |
| | | | | | | |
Merge commit '2278a04a0921007d726e9e1ec4b668860f961f88'
* commit '2278a04a0921007d726e9e1ec4b668860f961f88':
fix cut-and-paste error in verifier
|
| | |\| | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Merge commit '9acf28a390aab3e0f394c701bc3cda6cbc9393b3' into eclair-mr2-plus-aosp
* commit '9acf28a390aab3e0f394c701bc3cda6cbc9393b3':
fix cut-and-paste error in verifier
|
| | | |\ \ \ \ \
| | | | |/ / /
| | | |/| | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Merge commit 'c652e41d9173e299a8e1805ae1b2bba75a34ae12' into eclair-mr2
* commit 'c652e41d9173e299a8e1805ae1b2bba75a34ae12':
fix cut-and-paste error in verifier
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Oops.
|
| |\| | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Merge commit '6e5be9b24c232be4cfc22b7cbabb0fdf6d869f7c'
* commit '6e5be9b24c232be4cfc22b7cbabb0fdf6d869f7c':
eclair snapshot
|
| | |\ \ \ \ \ \
| | | |_|/ / /
| | |/| | | | |
|
| | | |\ \ \ \ \
| | | | |_|/ /
| | | |/| | |
| | | | | | | |
Merge commit 'goog/stage-korg-master' into HEAD
|
| | | | |\ \ \ \
| | | | | |_|/
| | | | |/| | |
|
| | | | | | | | |
|
| |\| | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Merge commit '4011770f2d06fcb743abc91a01a531c7ae2d9175'
* commit '4011770f2d06fcb743abc91a01a531c7ae2d9175':
|
| | |\| | | | |
| | |_|_|/ /
| |/| | | | |
|
| | | |\ \ \ \
| | | | |_|/
| | | |/| |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Merge commit '54ec81fe86225d5f3ee3ab16e3266ae88cd639fa' into eclair-plus-aosp
* commit '54ec81fe86225d5f3ee3ab16e3266ae88cd639fa':
replace generic recovery icons
|
| | | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Merge commit '988500b615de24455e1fee69e72055bb1dca9c86' into eclair-plus-aosp
* commit '988500b615de24455e1fee69e72055bb1dca9c86':
add terminator to recovery's getopt_long options array
|
| |\| | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Merge commit 'd93a25459cdefba940f254b4c5f54fd7d9cdaf11'
* commit 'd93a25459cdefba940f254b4c5f54fd7d9cdaf11':
simplify construction of the recovery progress bar
|
| | | |_|/ / /
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Instead of six separate images for the left end, right end, and tiled
center portion of the full and empty progress bars, just use two
images: a full bar and an empty bar. Draw the left side of the full
bar and the right side of the empty one, moving the boundary rightward
to "fill" the bar. This makes recovery trivially smaller, and allows
fancier images to be used as progress bars.
Support paletted PNG images as resources.
|
| |\| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Merge commit '54ec81fe86225d5f3ee3ab16e3266ae88cd639fa'
* commit '54ec81fe86225d5f3ee3ab16e3266ae88cd639fa':
replace generic recovery icons
|
| | |\ \ \ \ \
| | |_|/ / /
| |/| | | |
| | | | | |
| | | | | | |
* changes:
replace generic recovery icons
|
| | | | | | | |
|
| |\| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Merge commit '988500b615de24455e1fee69e72055bb1dca9c86'
* commit '988500b615de24455e1fee69e72055bb1dca9c86':
add terminator to recovery's getopt_long options array
|
| | |/ / / /
| | | | |
| | | | |
| | | | | |
http://b/2170691 - recovery argument parsing is broken
|
| |\ \ \ \ \
| | |/ / /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | | |
Merge commit '8f8bc4cb487e0f853c97cb5ff1481d707ac6b66d'
* commit '8f8bc4cb487e0f853c97cb5ff1481d707ac6b66d':
confirm before wiping user data in recovery
|
| | |\| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Merge commit 'f93d8166ef4c06f6ad71293ffa8a4ce469df4fa5' into eclair-plus-aosp
* commit 'f93d8166ef4c06f6ad71293ffa8a4ce469df4fa5':
confirm before wiping user data in recovery
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
When using the hidden menu to wipe data in recovery, confirm before
starting the wipe. (This does not affect booting with the --wipe_data
flag, or using Alt+W on dream with the menu hidden -- those still wipe
data immediately.)
|
| |\| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Merge commit '486aa290635dbf6f60b3435694951fed3470ffdf'
* commit '486aa290635dbf6f60b3435694951fed3470ffdf':
reduce fraction of progress bar for verification
|
| | |\| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Merge commit 'fd8fb0c49242af5147708f1a93ea3acba546555b' into eclair-plus-aosp
* commit 'fd8fb0c49242af5147708f1a93ea3acba546555b':
reduce fraction of progress bar for verification
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Reduce the fraction of the progress bar used for package verification
from 50% to 25%:
- verification is faster than before due to sha1 improvements
- in eclair we're now verifying the compressed data rather than
decompressing it
- incremental packages (which is what most installs use) write more
data than is contained in the package.
|
| |\| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Merge commit 'd16fb221cd27abea8a954bd5f6554fa116366519'
* commit 'd16fb221cd27abea8a954bd5f6554fa116366519':
delete files before symlinking; log error messages
|
| | |\| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Merge commit '60babf8ba766662cc0932e8271b67daa69cddd5f' into eclair-plus-aosp
* commit '60babf8ba766662cc0932e8271b67daa69cddd5f':
delete files before symlinking; log error messages
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The symlink() function should remove existing files before creating
symlinks, so scripts are idempotent. Log messages when various system
calls fail (but don't make the whole script fail).
|
| |\| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Merge commit '2f4fc56183f3fe2edb5e3cd5e12329871e02518f'
* commit '2f4fc56183f3fe2edb5e3cd5e12329871e02518f':
don't complain if recovery icon is short
|
| | |\| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Merge commit '196c25c777daedbe2fe5a45171fb42e43ceed9af' into eclair-plus-aosp
* commit '196c25c777daedbe2fe5a45171fb42e43ceed9af':
don't complain if recovery icon is short
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
If the a recovery icon file is so short that we can't even read the
8-byte header, put a message in the log but not on the device screen.
We intentionally have zero-length files for some icons on some devices,
if they're never shown (eg, the firmware installation icons are only
used on HTC devices).
|
| |\| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Merge commit 'b5d542cd40360867bc00cdb9266c0abf26448c55'
* commit 'b5d542cd40360867bc00cdb9266c0abf26448c55':
add a run_program() function to edify
|
| | |\| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Merge commit 'a3f89eabb7ddcf44add8ce3b321ceab6d35289cb' into eclair-plus-aosp
* commit 'a3f89eabb7ddcf44add8ce3b321ceab6d35289cb':
add a run_program() function to edify
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Handy for producing debugging OTA packages (eg, running sqlite3 or
whatever in recovery).
|
| |\| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Merge commit '9a77b613f3fdf6340b0f5f24d1c725fd0001e4a9'
* commit '9a77b613f3fdf6340b0f5f24d1c725fd0001e4a9':
|
| | |\ \ \ \
| | | |/ /
| | |/| | |
|
| | | |\ \ \
| | | | |/
| | | |/| |
|
| |\| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Merge commit 'cbf903803850deb4f70490d97a1603e7b8679cc2'
* commit 'cbf903803850deb4f70490d97a1603e7b8679cc2':
Not all failures to fopen_root_path() are serious.
|
| | |\| | |
| | |_|/
| |/| | |
|
| | | | |
| | | |
| | | |
| | | | |
Example: E:Can't open /cache/recovery/command.
|
| |\| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Merge commit '34c98df78a80881698f63ce0815f3e16823d85e0'
* commit '34c98df78a80881698f63ce0815f3e16823d85e0':
do not merge: cherry-pick of c2d666bd4f6eb5f7a9f17b10435c161cb105b7c5 from master
|
| | | | | |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
after a power loss
Submitted on behalf of Hong-Bin Wang <hong-binwang@motorola.com>
Signed-off-by: Jared Suttles <jared.suttles@motorola.com>
|
| |\| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Merge commit '54e2e86c5740a2c7a02e95e94c4aff362a5502cf'
* commit '54e2e86c5740a2c7a02e95e94c4aff362a5502cf':
do not merge: cherry-picked 60151a295ccf726238dc47456d80b427db6d6a38 from master branch
|
| | | | | |
|
| |/ / /
| | |
| | |
| | |
| | |
| | |
| | | |
In recovery, verify a signature that covers the entire zip file,
instead of using the jarsigner format to verify individual files.
Bug: 1328985
|
| |\| | |
|
| | |\ \ |
|
| |\ \ \ \
| | |_|/
| |/| |
| | | |
| | | |
| | | |
| | | | |
Merge commit '20697b965cd923211daeea2037f60218358b9659'
* commit '20697b965cd923211daeea2037f60218358b9659':
only build flash_image for eng
|
| | | |/
| |/|
| | |
| | |
| | |
| | | |
With the recovery image being installed by applypatch, the flash_image
tool isn't needed any more. Continue to build it for eng just in case
it's handy for debugging.
|
| |\ \ \
| | |/
| |/| |
|
| | |\ \ |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
gcc 4.4 complains about some of the recovery ui functions not being
declared. To include the header, we have to fix the 'volatile'
declaration (otherwise there's a compiler error).
Move the dream-specific images to vendor/htc/dream, make the default
images a generic phone.
|
| |\ \ \ \
| | |_|/
| |/| | |
|
| | | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | | |
Yank all the code to install OTA packages out of the recovery binary
itself. Now packages are installed by a binary included in the
package (run as a child of recovery), so we can make improvements in
the installation process without waiting for a new release to use
them.
|
| |\| |
| | |
| | |
| | |
| | |
| | |
| | | |
Merge commit 'bec02d57fb85cc7dd0196a54b0e9530e306623ac'
* commit 'bec02d57fb85cc7dd0196a54b0e9530e306623ac':
skip over all-zero blocks when reading MTD partition
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
We fail to detect certain bad blocks (marked in the factory as bad, I
think?) when reading mtd partitions. These come back as a block of
all zeros. Since it's fairly unlikely a legitimate boot or recovery
block will contain 128k of zeros, change mtdutils to skip over such
blocks.
Arve says https://review.source.android.com/10535 may be a long-term
fix for this, but he isn't yet sure.
|
| |\| |
| | |
| | |
| | |
| | |
| | |
| | | |
Merge commit 'd8f7c9b85e25fab93fef2221a84b60edc2e7b837'
* commit 'd8f7c9b85e25fab93fef2221a84b60edc2e7b837':
remove updater from the user system image
|
| | |\ \
| | | |
| | | |
| | | |
| | | | |
* changes:
remove updater from the user system image
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
updater (which is only needed in OTA packages) is getting included in
/system/bin, where it just takes up (quite a bit of) space. Use the
hack of including it only in eng builds so it's not there for user
builds.
|
| |\| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Merge commit '0bbfe3d901885c1f0ab006e8d4cc1029c44a7376'
* commit '0bbfe3d901885c1f0ab006e8d4cc1029c44a7376':
fix off-by-one error in set_perm()
|
| | |/ /
| | |
| | |
| | |
| | | |
We were inadvertently skipping over the first filename in the list of
arguments.
|
| |\| |
| | |
| | |
| | |
| | |
| | |
| | | |
Merge commit 'fbf3c10e45c20f8fe6bd1ac49ffe220035b9c454'
* commit 'fbf3c10e45c20f8fe6bd1ac49ffe220035b9c454':
improve updater progress bar
|
| | | |
| | |
| | |
| | |
| | |
| | | |
Let recovery accept set_progress commands to control progress over the
'current segment' of the bar. Add a set_progress() builtin to the
updater binary.
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
Allow devices (in BoardConfig.mk) to define additional static
libraries to be linked in to updater, to make device-specific
functions available in edify scripts. Modify the updater makefile to
arrange for device libraries to register their edify functions.
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Some devices want to do special things when recovery wipes data (eg,
wipe data in their baseband processor as well). Add a hook in the
device-specific recovery library that gets called when data is wiped.
Also add an amend root for the "mbm" partition.
|
| |\| |
| | |
| | |
| | |
| | |
| | |
| | | |
Merge commit '47cace98369f60df2351a65801c8065bb7f9dbf0'
* commit '47cace98369f60df2351a65801c8065bb7f9dbf0':
add file_getprop() to updater
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
Add a function to read a property from a ".prop"-formatted file
(key=value pairs, one per line, ignore # comment lines and blank
lines). Move ErrorAbort to the core of edify; it's not specific to
updater now that errors aren't stored in the app cookie.
|
| |\| | |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
To do a firmware-install-on-reboot, the update binary tells recovery
what file to install before rebooting. Let this file be specified as
"PACKAGE:<foo>" to indicate taking the file out of the OTA package,
avoiding an extra copy to /tmp. Bump the API version number to
reflect this change.
|
| |\| |
| | |
| | |
| | |
| | |
| | |
| | | |
Merge commit 'e3da02e7bcfd85c543419e7590a3c86f64d8cc8a'
* commit 'e3da02e7bcfd85c543419e7590a3c86f64d8cc8a':
add less_than_int, greater_than_int to edify
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
Add functions less_than_int() and greater_than_int() that interpret
their args as ints and do the comparison. ("<" and ">" operators, if
implemented, should do string comparison.) This lets us do the build
time check currently done by the check_prereq binary.
|
| |\| |
| | |
| | |
| | |
| | |
| | |
| | | |
Merge commit 'd9c9d10d9da76f067d3955bea71f7bb39e859fa5'
* commit 'd9c9d10d9da76f067d3955bea71f7bb39e859fa5':
fixes to edify and updater script
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
A few more changes to edify:
- fix write_raw_image(); my last change neglected to close the write
context, so the written image was corrupt.
- each expression tracks the span of the source code from which it
was compiled, so that assert()'s error message can include the
source of the expression that failed.
- the 'cookie' argument to each Function is replaced with a State
object, which contains the cookie, the source script (for use with
the above spans), and the current error message (replacing the
global variables that were used for this purpose).
- in the recovery image, a new command "ui_print" can be sent back
through the command pipe to cause text to appear on the screen.
Add a new ui_print() function to print things from scripts.
Rename existing "print" function to "stdout".
|
| |\| |
| | |
| | |
| | |
| | |
| | |
| | | |
Merge commit '8edb00c990e563e6f91b278a212f2edf877cf763'
* commit '8edb00c990e563e6f91b278a212f2edf877cf763':
edify extensions for OTA package installation, part 2
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Adds more edify functions for OTAs:
is_mounted getprop apply_patch apply_patch_check apply_patch_space
write_raw_image write_firmware_image package_extract_file
This allows us to install radios, hboots, boot images, and install
incremental OTA packages.
Fixes a couple of dumb bugs in edify itself:
- we were doubling the size of the function table each time it was
*not* full, rather than each time it was full
- "no such function" errors weren't visible to the parser, so they
didn't prevent execution of the script.
|
| |\| |
| | |
| | |
| | |
| | |
| | |
| | | |
Merge commit '9dbc027b5f540bcf23c968398f8a70e92abd56cd'
* commit '9dbc027b5f540bcf23c968398f8a70e92abd56cd':
fix sim build in donut, too
|
| | | | |
|
| |\| |
| | |
| | |
| | |
| | |
| | |
| | | |
Merge commit '9931f7f3c1288171319e9ff7d053ebaad07db720'
* commit '9931f7f3c1288171319e9ff7d053ebaad07db720':
edify extensions for OTA package installation, part 1
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Adds the following edify functions:
mount unmount format show_progress delete delete_recursive
package_extract symlink set_perm set_perm_recursive
This set is enough to extract and install the system part of a (full)
OTA package.
Adds the updater binary that extracts an edify script from the OTA
package and then executes it. Minor changes to the edify core (adds a
sleep() builtin for debugging, adds "." to the set of characters that
can appear in an unquoted string).
|
| | | | |
|
| | | |
| | |
| | |
| | |
| | | |
When I changed the definition of device_perform_action() in response
to a reviewer comment, I forgot to change this implementation.
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Take some device-specific details of the recovery UI (eg, what keys to
press to bring up the interface and perform actions, exact text of the
menu, etc.) and split them out into separate C functions. Arrange to
take implementations of those functions from the appropriate vendor
directory at build time. Provide a default implementation in case no
vendor-specific one is available.
|
| |\| |
| | |
| | |
| | |
| | |
| | |
| | | |
Merge commit '9b9c2114bd7d02200ce43cb9ec513473079dfad9'
* commit '9b9c2114bd7d02200ce43cb9ec513473079dfad9':
core of edify, an eventual replacement for amend
|
| | |\ \
| | | |
| | | |
| | | |
| | | | |
* changes:
core of edify, an eventual replacement for amend
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Edify is a simple scripting language for OTA installation, to be used
when we move to OTAs being installed via binaries shipped with the
package.
|
| | | | |
| | | |
| | | |
| | | | |
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
|
| |\| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Merge commit 'b2ee9201be583b17ddbf0eaa69a37545f992b565'
* commit 'b2ee9201be583b17ddbf0eaa69a37545f992b565':
allow OTA package to provide binary instead of script
|
| | |/ /
| | |
| | |
| | |
| | | |
Allow installation of OTA packages which do not contain an
update-script, but instead contain an update-binary.
|
| |\| |
| | |
| | |
| | |
| | |
| | |
| | | |
Merge commit 'f28c916e73ee9f643c67c70d059c70381d774cb0'
* commit 'f28c916e73ee9f643c67c70d059c70381d774cb0':
remove unused permissions scheme from amend
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
Amend (aka the recovery command language) had a half-implemented
scheme of limiting which commands OTA packages were allowed to
execute. It's not clear what this was ever supposed to be good for.
Remove it.
|
| |\| |
| | |
| | |
| | |
| | |
| | |
| | | |
Merge commit '07e1dca7068284c4f3013550335029eb72b39b82'
* commit '07e1dca7068284c4f3013550335029eb72b39b82':
don't say "install complete" when it really isn't
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
Change the recovery UI so that when there is a hboot or radio update
pending (which the user most do a home+back reboot to actually
install), the UI tells them so, instead of saying "Install from sdcard
complete."
|
| |\| |
| | |
| | |
| | |
| | |
| | |
| | | |
Merge commit '1c4ceae38f3fd7eb1e451d430acb5d99f257b0f9'
* commit '1c4ceae38f3fd7eb1e451d430acb5d99f257b0f9':
undo temporary alignment hack
|
| | | |
| | |
| | |
| | |
| | |
| | | |
Remove the memory alignment that mysteriously made OTA installs work,
in anticipation of a kernel that fixes the actual problem. Handle
EINTR properly.
|
| |\| |
| | |
| | |
| | |
| | |
| | |
| | | |
Merge commit '683c4628039a8cb6dad1a086fae23a7d71438414'
* commit '683c4628039a8cb6dad1a086fae23a7d71438414':
align data passed to write() on 32k boundaries
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
In donut, OTA installation often encounters the write() system call
doing short writes -- which is legal but unexpected -- or failing with
ENOSPC when plenty of space is available. Passing aligned memory
buffers to write() appears to prevent (or at least reduce the
frequency) of these problems. b/1833052 has been filed to look at the
underlying problem, but this change aligns buffers we use with write()
so we can OTA for now (or see if this problem still occurs).
|
| |\| |
| | |
| | |
| | |
| | |
| | |
| | | |
Merge commit '596271fa71d79e3eec03c7cf6ac76cb026dd8578'
* commit '596271fa71d79e3eec03c7cf6ac76cb026dd8578':
handle short writes when unzipping files
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
minzip fails if write() doesn't write all the data in one call.
Apparently this was good enough before, but it causes OTAs to fail all
the time now (maybe due to the recently-submitted kernel)? Change
code to attempt continuing after short writes.
|
| |\| | |
|
| | |\ \ |
|
| |\| | | |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
them from an external file in the recovery image. Use the
test-keys for all builds.
Automated import of CL 144130
|
| | | | |
| | | |
| | | |
| | | | |
Automated import of CL 144082
|
| | | | |
| | | |
| | | |
| | | | |
Automated import of CL 144070
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
about 60k from the recovery and system images.
Automated import of CL 143128
|
| | | | | |
|
| | | | | |
|
| |\ \ \ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
them from an external file in the recovery image. Use the
test-keys for all builds.
Original author: dougz
Merged from: //branches/donutburger/...
Automated import of CL 144132
|
| |\| | | | |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Original author: dougz
Merged from: //branches/donutburger/...
Automated import of CL 144105
|
| |\| | | | |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Original author: dougz
Merged from: //branches/donutburger/...
Automated import of CL 144101
|
| |\ \ \ \ \
| |/ / / /
|/| | | /
| | |_|/
| |/| | |
|
| | |\ \ \
| | | |/
| | |/| |
|
| | | | | |
|
| | | |/ |
|
| | |\| |
|
| | | |
| | |
| | |
| | | |
Resolves http://code.google.com/p/android/issues/detail?id=2077
|
| | |\ \ |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
about 60k from the recovery and system images.
Original author: dougz
Merged from: //branches/donutburger/...
Automated import of CL 143289
|
| | | | | |
|
| | |_|/
|/| | |
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | | |
|
| | |/
|/| |
|
| |/ |
|
| | |
|
| |
|
