| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| | |
* commit '6d1d7ffa051a3aaba40c9ca2ea7d68c0465e0a52':
recovery: change the way of rebooting when using power key combo
|
| | |\
| | |
| | |
| | |
| | | |
* commit 'b48bdbeda03af04ec8e0d52f6af680a9062eb916':
recovery: change the way of rebooting when using power key combo
|
| | | |\ |
|
| | | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The power key combo allow to reboot from recovery mode by pressing
power button 7 times in a row. It calls directly the function
android_reboot() and lead to permission denial errors because of SE
Linux rules enforcement.
The right way to reboot from recovery is to set the property
"sys.powerctl" and let init handle it.
Change-Id: I5a6c3c49b27cef305815cef96da729390e19c9bc
Signed-off-by: Gaelle Nassiet <gaellex.nassiet@intel.com>
|
| |\| |
| | |
| | |
| | |
| | | |
* commit '0b1d15742f4cc7f930981fc63ee74b5df51ce719':
Stop using libstdc++.
|
| | |\|
| | |
| | |
| | |
| | | |
* commit 'a8cd96adeeb530eda74e435e626900a3a76844a7':
Stop using libstdc++.
|
| | | |\ |
|
| | | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
These are already getting libc++, so it isn't necessary. If any of the
other static libraries (such as adb) use new or delete from libc++,
there will be symbol collisions.
Change-Id: I55e43ec60006d3c2403122fa1174bde06f18e09f
|
| |\| |
| | |
| | |
| | |
| | | |
* commit '6dc1e6a6ef943abf73f7b78f076fe395dc509c86':
Add error and range checks to parse_range
|
| | |\|
| | |
| | |
| | |
| | | |
* commit '6253753ab9b8c8912f31aeb5cc2877a856ecfe82':
Add error and range checks to parse_range
|
| | | |\ |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Only trusted input is passed to parse_range, but check for invalid
input to catch possible problems in transfer lists.
Bug: 21033983
Bug: 21034030
Bug: 21034172
Bug: 21034406
Change-Id: Ia17537a2d23d5f701522fbc42ed38924e1ee3366
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '1857a7f57929a3bb4c831199b702059b259b0e3e':
Don't use TEMP_FAILURE_RETRY on close in recovery.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Bug: http://b/20501816
Change-Id: I35efcd8dcec7a6492ba70602d380d9980cdda31f
(cherry picked from commit b47afedb42866e85b76822736d915afd371ef5f0)
|
| |\ \ \ \ \
| | |/ / /
| |/| | |
| | | | |
| | | | | |
* commit '09050fc92ef94a5ea0ee84f09f511850424f9216':
Don't use TEMP_FAILURE_RETRY on close in recovery.
|
| | |\ \ \ \
| | | |/ /
| | |/| |
| | | | |
| | | | | |
* commit 'cd7d9d8374f45c7e2eb14d8dbabf3cf7c221a5b8':
Don't use TEMP_FAILURE_RETRY on close in recovery.
|
| | | |\ \ \
| | | |_|/
| | |/| | |
|
| | | |/ /
| | | |
| | | |
| | | |
| | | | |
Bug: http://b/20501816
Change-Id: I35efcd8dcec7a6492ba70602d380d9980cdda31f
|
| |\| | |
| | | |
| | | |
| | | |
| | | | |
* commit '5bb8d55180db37bbfaedccc2261a2f55f21c4b73':
init sets the default PATH itself, better.
|
| | |\| |
| | | |
| | | |
| | | |
| | | | |
* commit '3badd56326422a79b5b09a98fc0282d915cf5e32':
init sets the default PATH itself, better.
|
| | | |\ \ |
|
| | | |/ /
| | | |
| | | |
| | | |
| | | |
| | | | |
This fixes 'su' and 'strace' in the recovery image.
Change-Id: I83c2664d32a15da92bb6092fbdfc772184013c88
|
| |\| | |
| | | |
| | | |
| | | |
| | | | |
* commit 'cfe46542e424e5e2159cf5212f72ae8f53c589a6':
Fix build following adb change.
|
| | |\| |
| | | |
| | | |
| | | |
| | | | |
* commit '3128176e7d8f5cee4afdff3b5fdcadbe66ef97af':
Fix build following adb change.
|
| | | |\ \ |
|
| | | |/ /
| | | |
| | | |
| | | | |
Change-Id: I2e0fb7e880e205b0bca324ff53ffdb5df9e34baf
|
| |\| | |
| | | |
| | | |
| | | |
| | | | |
* commit '3257155e8957b8cba4b59d7928990f1642183415':
Add an alternate screen for viewing recovery logs.
|
| | |\| |
| | | |
| | | |
| | | |
| | | | |
* commit '77a2c8839f2de5947184605815015bc2696c3207':
Add an alternate screen for viewing recovery logs.
|
| | | |\ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This makes it easier to go back and forth without losing current output.
Also make the display more like regular more(1).
Bug: http://b/20834540
Change-Id: Icc5703e9c8a378cc7072d8ebb79e34451267ee1b
|
| |\| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '25a67fde9fe5ebaeb79dbb3edf0fc4857adf5da2':
uncrypt: Switch to C++
|
| | |\| | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '7ff339ea1b36d46439e9255364cd9a4b2e73719a':
uncrypt: Switch to C++
|
| | | |\ \ \
| | | |/ /
| | |/| | |
|
| | | |/ /
| | | |
| | | |
| | | |
| | | |
| | | | |
Also apply some trivial changes like int -> bool and clean-ups.
Change-Id: Ic55fc8b82d7e91b321f69d10175be23d5c04eb92
|
| |\ \ \ \
| | |_|/
| |/| |
| | | |
| | | | |
* commit 'df52e1e119804cc5e7d0b7f77a7d1bf42b2da9dc':
Add an alternate screen for viewing recovery logs.
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This makes it easier to go back and forth without losing current output.
Also make the display more like regular more(1).
Bug: http://b/20834540
Change-Id: Icc5703e9c8a378cc7072d8ebb79e34451267ee1b
(cherry picked from commit c049163234003ef463bca018920622bc8269c69b)
|
| |\ \ \ \
| | |/ /
| |/| |
| | | | |
Change-Id: Ia447435f1345a0bf9648d1d5593e276191d6a99c
|
| | |\ \ \
| | | |/
| | |/|
| | | |
| | | | |
* commit 'aeb980bd8958e3c6e135835aa7d34b5c4e3a601b':
uncrypt: package on non-data partition should follow the right path
|
| | | |\ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Fix the accidental change of behavior in [1]. OTA packages not on /data
partition should still go through the path that has validity checks and
wipe_misc() steps.
[1]: commit eaf33654c1817bd665831a13c5bd0c04daabee02.
Change-Id: Ice9a049f6259cd2368d2fb95a991f8a6a0120bdd
|
| |\| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '481508426cb258ebf809a9f46ec4f5689d0459ef':
Track adb_thread_create API change.
|
| | |\| | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '41c7ef5400634508db5127ea45108cf94f8e36ab':
Track adb_thread_create API change.
|
| | | |\ \ \ |
|
| | | | |/ /
| | | | |
| | | | |
| | | | | |
Change-Id: Ia3f30f3ba85c0246d4b667fb7723cfcdce299d4a
|
| |\| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '185e8204c6e29e2177721a30c73928fb4e5382fa':
Keep multiple kernel logs
|
| | |\| | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit 'c7f64fdf08b254ff94012c1815198b9635f508a7':
Keep multiple kernel logs
|
| | | |\ \ \
| | | |/ /
| | |/| | |
|
| | | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Currently we are keeping one copy of the kernel log (LAST_KMSG_FILE).
This CL changes to keep up to KEEP_LOG_COUNT copies for kernel logs.
Bug: http://b/18092237
Change-Id: I1bf5e230de3efd6a48a5b2ae5a34241cb4d9ca90
|
| |\ \ \ \
| | |_|/
| |/| |
| | | |
| | | | |
* commit '3e8d28b547cd75af3f77f38a7e2895d0dbd2e232':
uncrypt: Switch to C++
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Also apply some trivial changes like int -> bool and clean-ups.
Change-Id: I5c6c42d34965305c394f4f2de78487bd1174992a
(cherry picked from commit 381f455cac0905b023dde79625b06c27b6165dd0)
|
| |\| | |
| | | |
| | | |
| | | |
| | | | |
* commit '8853cb2f296adfdc57871e9482a8e97b0011b323':
uncrypt: package on non-data partition should follow the right path
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Fix the accidental change of behavior in [1]. OTA packages not on /data
partition should still go through the path that has validity checks and
wipe_misc() steps.
[1]: commit eaf33654c1817bd665831a13c5bd0c04daabee02.
Change-Id: I3e86e19f06603bfe6ecc691c9aa66a8a8a79c5fb
(cherry picked from commit fb4ccef1df4f0bd8fa830c750f2970dd2df9e51b)
|
| |\| | |
| | | |
| | | |
| | | |
| | | | |
* commit '93cec9a0c402d6ca5d41e10db738bb5f61b19be2':
Keep multiple kernel logs
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Currently we are keeping one copy of the kernel log (LAST_KMSG_FILE).
This CL changes to keep up to KEEP_LOG_COUNT copies for kernel logs.
Bug: http://b/18092237
Change-Id: Ied862b5b70cbbae7775f59c78c32ec62aeeca655
(cherry picked from commit bef39710ff50cedf6a4de8eb6c7802f66930aab4)
|
| |\| | |
| | | |
| | | |
| | | |
| | | | |
* commit '6d820f2c91f6cafcec5b378ae896b7118ca8921d':
Turn on text display for debuggable builds
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
For userdebug and eng builds, turn on the text display automatically
if no command is specified.
(cherry-pick of 785d22c88cda46972331c04ebc9df97371a696da.)
Bug: http://b/17489952
Change-Id: I38377c45f2a8e45ca788e5506695aa88c769cbcf
|
| |\ \ \ \
| | |/ /
| |/| |
| | | |
| | | | |
* commit '0a7b92762a42be7dd01da87b5f67a405f6f07d31':
Turn on text display for debuggable builds
|
| | |\ \ \
| | | |/
| | |/|
| | | |
| | | | |
* commit 'f8f8832179003ad0a4e9359ef16e2f49d9f38345':
Turn on text display for debuggable builds
|
| | | |\ \ |
|
| | | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
For userdebug and eng builds, turn on the text display automatically
if no command is specified.
Bug: http://b/17489952
Change-Id: I3d42ba2848b968da12164ddfda915ca69dcecba1
|
| |\ \ \ \
| | |_|/
| |/| |
| | | |
| | | | |
* commit '4cf34d5d297db4f7130a7f1472c394e38ea0e642':
Fix mips64 minadbd_test build.
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Looks like the mips64 linker isn't as good as the others at GCing
unused stuff, which means it needs libcutils.
Change-Id: I5f768e44514350fb81e5360351db3e9cc4201702
(cherry picked from commit dbb20c48633e63c7c244e84f3fea76e083e225d7)
|
| |\ \ \ \
| | |/ /
| |/| |
| | | |
| | | | |
* commit '4b3004a6c93481e659647e7b40beb572f140683b':
Fix mips64 minadbd_test build.
|
| | |\ \ \
| | | |/
| | |/|
| | | |
| | | | |
* commit '59e1e3e78f53438cb5843d7e151dddb0d782328c':
Fix mips64 minadbd_test build.
|
| | | |\ \ |
|
| | | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Looks like the mips64 linker isn't as good as the others at GCing
unused stuff, which means it needs libcutils.
Change-Id: I5f768e44514350fb81e5360351db3e9cc4201702
|
| |\ \ \ \
| | |_|/
| |/| |
| | | |
| | | | |
* commit '15931924e1820d4c2bc9f9c0c7734c43c92b866b':
Move minadb over to new API.
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Change-Id: I889bcf2222245c7665287513669cae8831e37081
(cherry picked from commit 4039933c62f52dda06e6f355cf42ac9b392d0888)
|
| |\| | |
| | | |
| | | |
| | | |
| | | | |
* commit '87ec73a264530f5fa19cde2598d5e65c4c67a686':
Fix minadb_test build breakage.
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Change-Id: I98bb900debb7d7dd57d3f8f84d605163ec192b03
(cherry picked from commit 3e7d82c621240bb80f9882c64377c4f5f3d97c7b)
|
| |\ \ \ \
| | |/ /
| |/| |
| | | |
| | | | |
* commit 'c0537d688529bd38e691ead93815ece29ad15b7b':
Move minadb over to new API.
|
| | |\ \ \
| | | |/
| | |/|
| | | |
| | | | |
* commit '6bc2d538ae304edbd6bf514cb61444844313032d':
Move minadb over to new API.
|
| | | |\ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Change-Id: I889bcf2222245c7665287513669cae8831e37081
|
| |\| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit 'c67e89ada5b8f549e8844e0b722d3310398bf4e8':
Fix minadb_test build breakage.
|
| | |\| | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '30cea3dcaf1dcf4be9954178f67b4f8dff0fb9f9':
Fix minadb_test build breakage.
|
| | | |\ \ \
| | | |/ /
| | |/| | |
|
| | | |/ /
| | | |
| | | |
| | | | |
Change-Id: I98bb900debb7d7dd57d3f8f84d605163ec192b03
|
| |\ \ \ \
| | |_|/
| |/| |
| | | |
| | | | |
* commit '2f5feedf1d705b53e5bf90c8b5207dd91f4522f1':
Check all lseek calls succeed.
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Also add missing TEMP_FAILURE_RETRYs on read, write, and lseek.
Bug: http://b/20625546
Change-Id: I03b198e11c1921b35518ee2dd005a7cfcf4fd94b
(cherry picked from commit 7bad7c4646ee8fd8d6e6ed0ffd3ddbb0c1b41a2f)
|
| |\ \ \ \
| | |/ /
| |/| |
| | | |
| | | | |
* commit '34d3a3d074e977cace29797c428795e1de5b3223':
Check all lseek calls succeed.
|
| | |\ \ \
| | | |/
| | |/|
| | | |
| | | | |
* commit '34c7731a0bb296a1289b85a83f53026117aa3677':
Check all lseek calls succeed.
|
| | | |\ \ |
|
| | | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Also add missing TEMP_FAILURE_RETRYs on read, write, and lseek.
Bug: http://b/20625546
Change-Id: I03b198e11c1921b35518ee2dd005a7cfcf4fd94b
|
| |\ \ \ \
| | |_|/
| |/| |
| | | |
| | | | |
* commit 'f7466f9f2334b0e9025e1c7ecf65b4d04a246b20':
Stop using adb_strtok, and check argument validity.
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
(cherry picked from commit ba45ddf37cf4543143af6b2e27fc1214f3dbe892)
Change-Id: Iba4f77f7db54ca0184437bd8ea96abfadabc72a3
|
| |\ \ \ \
| |/ / /
|/| / /
| |/ /
| | | |
* commit 'bc4e69fc2827d7b8648a30d3b29eca3cb886fc9a':
Stop using adb_strtok, and check argument validity.
|
| | |\|
| | |
| | |
| | |
| | | |
* commit '8c389e9c769c8632cf16c0794f1e84f49996077c':
Stop using adb_strtok, and check argument validity.
|
| | | |\ |
|
| | | |/
| | |
| | |
| | | |
Change-Id: I323ffda71b82cc939aed446f9c9fb86ca78df153
|
| |\ \ \
| | | |
| | | |
| | | |
| | | | |
* commit '599fc2c0edbeb2ce8f38905fd770dbd7f43e647c':
DO NOT MERGE Revert "Erase PST partition if its marked to be erased."
|
| | |\ \ \
| | |/ /
| |/| |
| | | |
| | | | |
* commit 'c94fa0b01b43709531dfbcdb94abb2a1cc23be3d':
DO NOT MERGE Revert "Erase PST partition if its marked to be erased."
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This now gets done at the framework level. Doing it here breaks the signature on the partition.
This reverts commit ee19387905650cab5da7dd97ada5502cd17ac93d.
Bug: 19967123
Change-Id: I447b926b733ca145f11a916d9569ce39889db627
|
| |\| | |
| | | |
| | | |
| | | |
| | | | |
* commit '5a95719bd9ac27d573388e6aa4b48715d9aa3d9e':
Revert "Revert "init re-execs to set its security context now.""
|
| | |\ \ \
| | | |/
| | |/|
| | | |
| | | | |
* commit '6725ebc7b41ae0702adb28d9b40fbd392c6bfb9a':
Revert "Revert "init re-execs to set its security context now.""
|
| | | |\ \ |
|
| | | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This reverts commit c819dbe95bf80645178b0180f519ab2983da01a0.
Bug: http://b/19702273
Change-Id: I5c75b148a12e644dd247a4df4f67dc9b4b9ff8cf
|
| |\| | |
| | | |
| | | |
| | | |
| | | | |
* commit 'f6c03a80f08542afc82780f3b7cafe994d7a41e4':
Revert "init re-execs to set its security context now."
|
| | |\| |
| | | |
| | | |
| | | |
| | | | |
* commit 'c690332c5e4008d0f58d7a356311a821ef07d0cf':
Revert "init re-execs to set its security context now."
|
| | | |\ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
shamu isn't booting now
This reverts commit c57453d5377a13445c4b1d3f73c0e0ab19aa0c1e.
Change-Id: I8efbf6260f5fcf983e5056fac6d03916415b944e
|
| |\| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '7058b89f02bc367bc2cd4e9c3ee70404e71cf48c':
init re-execs to set its security context now.
|
| | |\| | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '38a82cace581a888c5bc475754a20d8e92992fb2':
init re-execs to set its security context now.
|
| | | |\| | |
|
| | | |/ /
| | | |
| | | |
| | | | |
Change-Id: I0a014f8dddfe775159903b5d6fa632733fef692c
|
| |\| | |
| | | |
| | | |
| | | |
| | | | |
* commit '0391820cde1f27515e9fc8f556b72c3922af9d45':
Don't remove existing explicitly stashed blocks
|
| | |\| |
| | | |
| | | |
| | | |
| | | | |
* commit '0de2351e6a6be685e1d68661dcf5f4902898cacd':
Don't remove existing explicitly stashed blocks
|
| | | |\ \ |
|
| | | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When automatically stashing overlapping blocks, should the stash
file already exist due to an explicit stash command, it's not safe
to remove the stash file after the command has completed.
Note that it is safe to assume that the stash file will remain in
place during the execution of the next command, so we don't have
take other measures to preserve overlapping blocks.
The stash file itself will be removed by a free command when it's
no longer needed.
Bug: 20297065
Change-Id: I8ff1a798b94086adff183c5aac03260eb947ae2c
|
| |\| | |
| | | |
| | | |
| | | |
| | | | |
* commit '51f42b2d20349490c62b9187bde317f25765e9b3':
imgdiff: Avoid infinite loop if inflate fails
|
| | |\| |
| | | |
| | | |
| | | |
| | | | |
* commit '4381767aa6410902e07376f62f66bbef83ebf2c4':
imgdiff: Avoid infinite loop if inflate fails
|
| | | |\ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Break out of the loop if inflate returns an error
and print some details.
Change-Id: Ie157cf943291b1a26f4523b17691dfcefbc881dc
|
| |\| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '0a557b6bc2a26afd3cb3a2e3dd2fdaf175b09cce':
Don't use typedefs that hide *s.
|
| | |\| | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '7176a61718e7b45a8fde3a25eada0c9425d1dece':
Don't use typedefs that hide *s.
|
| | | |\ \ \ |
|
| | | |/ / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
gr_surface was causing confusion for no good reason.
Change-Id: If7120187f9a00dd16297877fc49352185a4d4ea6
|
| |\| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '98bfb6f797220818a4018ef5f3aa65fc074c8fc4':
Move the menu header out of the menu.
|
| | |\| | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '6e435abfeb7256b5ea82ca37166acf36e3f98085':
Move the menu header out of the menu.
|
| | | |\ \ \
| | | |/ /
| | |/| | |
|
| | | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This makes it easier for us to deal with arbitrary information at the
top, and means that headers added by specific commands don't overwrite
the default ones.
Add the fingerprint back, but broken up so it fits even on sprout's
display.
Change-Id: Id71da79ab1aa455a611d72756a3100a97ceb4c1c
|
| |\| | |
| | | |
| | | |
| | | |
| | | | |
* commit 'cbdc7e844a8dafbada50ca8bae9319b7bd7980f2':
Add missing \n after "Mounting /system." message.
|
| | |\| |
| | | |
| | | |
| | | |
| | | | |
* commit '17b032e159779886f0151641a9aad5003debdce2':
Add missing \n after "Mounting /system." message.
|
| | | |\ \ |
|
| | | |/ /
| | | |
| | | |
| | | | |
Change-Id: I280a478526f033f5c0041d7e8a818fce6177d732
|
| |\| | |
| | | |
| | | |
| | | |
| | | | |
* commit 'd7823c5dfed67b1e8b0e175e588fb2dc643ebc65':
Remove unnecessary globals.
|
| | |\| |
| | | |
| | | |
| | | |
| | | | |
* commit 'eab12de70efb649ab33f7971e948251895d613fe':
Remove unnecessary globals.
|
| | | |\ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Change-Id: I76a042432aede08ceaf250319cf5eeb25d601150
|
| |\| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '507630e99cecddca3c22425a76634c8461faf46e':
Treat KEY_ENTER the same as KEY_POWER in the pager.
|
| | |\| | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit 'b68c4fc42617acb97dde89f501caf8558a348b51':
Treat KEY_ENTER the same as KEY_POWER in the pager.
|
| | | |\ \ \
| | | |/ /
| | |/| | |
|
| | | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Our long-press UI sends KEY_ENTER for long presses, which the long-press
UI treats as equivalent to KEY_POWER in the regular UI. So anywhere we accept
KEY_POWER we should accept KEY_ENTER too.
Change-Id: I99d376c961887043cf02037c26d000c8ba4d66f9
|
| |\| | |
| | | |
| | | |
| | | |
| | | | |
* commit 'd56e0f377eab630b1fbedcf291954489fd4fa5e3':
Rewritten file pager.
|
| | |\| |
| | | |
| | | |
| | | |
| | | | |
* commit '0e3781ef9af2df648f54eb2a7765bef7b6b5b22e':
Rewritten file pager.
|
| | | |\ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Most importantly, this one no longer skips lines because of wrapping.
Change-Id: Ic1c1944682ab8cbf3d542418ee86d29819173fc9
|
| |\| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit 'dd4d48be37c9899cad6ede0b13ee375ddc46e5f3':
Revert "Append kernel logs to last_log file"
|
| | |\| | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '558ba1bafa232935148b6483dc40277cdf4be292':
Revert "Append kernel logs to last_log file"
|
| | | |\ \ \ |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This reverts commit 2ec803f4350f7b72f5dd65c5f27656c6807e2966.
Change-Id: I419025a772ef99db4c0a78bfa7ef66767f3fa062
|
| |\| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* commit 'fa51b50ae75344addbf0671719f6cf4deaa57217':
Append kernel logs to last_log file
|
| | |\| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* commit '464c3e718f4c52444d17ab66ab6c9f71936cd4b8':
Append kernel logs to last_log file
|
| | | |\| | | |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Currently we are keeping one copy of the kernel log (LAST_KMSG_FILE).
This CL changes to append it to the recovery log.
Bug: 18092237
Change-Id: I06ad5629016846927153064f1663753a90296f79
|
| |\| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* commit '57ca725d874c8434284a4345ac24c55d207367ad':
Update the comments for package installer commands
|
| | |\| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* commit '6d1bd3d3d4f7e715b2692696eb75e1927a4cd954':
Update the comments for package installer commands
|
| | | |\ \ \ \
| | | |_|/ /
| | |/| | | |
|
| | | | |/ /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
These commands are for the communication between the installer and the
update binary (edify interpreter). Update the comments in sync with the
codes.
Change-Id: I7390f022b1447049a974b0b45697ef1d2e71d4e0
|
| |\| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '34bbc7d49a4f0578798d039fc16369b1a6ea16bd':
Auto-detect whether to use the long-press UI.
|
| | |\| | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit 'f19007a5252d62020c3ac8796908d9ee4653830d':
Auto-detect whether to use the long-press UI.
|
| | | |\ \ \
| | | |/ /
| | |/| | |
|
| | | |/ /
| | | |
| | | |
| | | | |
Change-Id: Ie77a5584e301467c6a5e164d2c62d6f036b2c0c0
|
| |\| | |
| | | |
| | | |
| | | |
| | | | |
* commit 'a90ba39beb8762f5a1f21b03f2734acda4fb03b1':
Switch minadb over to C++.
|
| | |\| |
| | | |
| | | |
| | | |
| | | | |
* commit '51697d2781501c30d8db6d2a8e6c2becebcffad8':
Switch minadb over to C++.
|
| | | |\ \ |
|
| | | |/ /
| | | |
| | | |
| | | | |
Change-Id: I5afaf70caa590525627c676c88b445d3162de33e
|
| |\| | |
| | | |
| | | |
| | | |
| | | | |
* commit '53b8ca4b7215389488862010751b956729e92733':
Switch minui over to C++.
|
| | |\| |
| | | |
| | | |
| | | |
| | | | |
* commit '23017c5d5c145a1040ee49466d30489d6e11bb61':
Switch minui over to C++.
|
| | | |\ \ |
|
| | | |/ /
| | | |
| | | |
| | | | |
Change-Id: I59e08a304ae514a3fdb6fab58721f11670bc1b01
|
| |\| | |
| | | |
| | | |
| | | |
| | | | |
* commit '9b0ebf992e01960db42ab7debf02bb25b372c734':
Fix ScreenRecoveryUI to handle devices without power/up/down.
|
| | |\| |
| | | |
| | | |
| | | |
| | | | |
* commit '5d1630a926a02ca13a66eb1e385eabba16b04cfc':
Fix ScreenRecoveryUI to handle devices without power/up/down.
|
| | | |\ \ |
|
| | | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Currently fugu has a custom subclass to handle this. The default code
supports devices with trackballs but not all shipping Nexus devices?
That's just silly.
Change-Id: Id2779c91284899a26b4bb1af41e7033aa889df10
|
| |\| | |
| | | |
| | | |
| | | |
| | | | |
* commit 'c22f5774d04bed56c7c00874b5a0a0ec37f605aa':
Move "Mount /system" to the main menu.
|
| | |\| |
| | | |
| | | |
| | | |
| | | | |
* commit '6b0dd1d7e1e1f3645230f880db95cad1279a826b':
Move "Mount /system" to the main menu.
|
| | | |\ \ |
|
| | | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Everyone's adding secret key combinations for this anyway, and it's
very useful when debugging.
Change-Id: Iad549452b872a7af963dd649f283ebcd3ea24234
|
| |\| | |
| | | |
| | | |
| | | |
| | | | |
* commit '10dacbce5ce330310ab630aa9199db620b171e76':
Add ev_iterate_available_keys to minui.
|
| | |\| |
| | | |
| | | |
| | | |
| | | | |
* commit '18eaa0cfe7aa775546369de829a1ff3049cf82a5':
Add ev_iterate_available_keys to minui.
|
| | | |\ \ |
|
| | | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This lets us recognize whether we have up/down/power, say, and tailor
the UI accordingly.
Change-Id: If94e454f14243b59d2f473ac9a436bd60591da01
|
| |\| | |
| | | |
| | | |
| | | |
| | | | |
* commit '5f3dee94480bff0b16dcbb58cc675785bf52ba75':
Move the recovery image version out of the menu header.
|
| | |\| |
| | | |
| | | |
| | | |
| | | | |
* commit 'f471861e832e4be3a07359dfb72c1812de64b7ac':
Move the recovery image version out of the menu header.
|
| | | |\ \ |
|
| | | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Rather than add code to wrap menu items, let's just put output the
recovery version to the log. It'll be visible at the bottom of the
screen and automatically wrap.
Change-Id: I158fe2d85bc56b195e00619fba455321743923bd
|
| |\| | |
| | | |
| | | |
| | | |
| | | | |
* commit '7b66aaebefb64e75597b33dbfac90072a8e32e9b':
Move default implementations into Device.
|
| | |\| |
| | | |
| | | |
| | | |
| | | | |
* commit 'e001074f227fb74f6ebf5b26c222d09fe69712c0':
Move default implementations into Device.
|
| | | |\ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The current abstract class was a nice idea but has led to a lot of
copy & paste in practice. Right now, no one we know of has any extra
menu items, so let's make the default menu available to everyone.
(If we assume that someone somewhere really does need custom
device-specific menu options, a better API would let them add to
our menu rather than replacing it.)
Change-Id: I59f6a92f3ecd830c2ce78ce9da19eaaf472c5dfa
|
| |\| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '0c23c97c78211bc98c3dadd7f613e764e183a0ea':
Remove some commented-out code.
|
| | |\| | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '06522ef517196062299852d59593eba0ea2be3c0':
Remove some commented-out code.
|
| | | |\ \ \
| | | |/ /
| | |/| | |
|
| | | |/ /
| | | |
| | | |
| | | | |
Change-Id: Ifb466ee2a89da88832c04086fa43da2b8409c232
|
| |\| | |
| | | |
| | | |
| | | |
| | | | |
* commit '382ec478d1ed1576d25d51205a1c67b190174172':
Move file paging into ScreenRecoveryUI.
|
| | |\| |
| | | |
| | | |
| | | |
| | | | |
* commit '52222a58417e7e6349e91e19e4f5e293a3a971c5':
Move file paging into ScreenRecoveryUI.
|
| | | |\ \ |
|
| | | |/ /
| | | |
| | | |
| | | |
| | | |
| | | | |
This fixes the N9 performance problem.
Change-Id: I00c10d4162ff266a6243285e5a5e768217f6f799
|
| |\| | |
| | | |
| | | |
| | | |
| | | | |
* commit '36640972b04c0b91207583e35f78acded4a28190':
Enable printf format argument checking.
|
| | |\| |
| | | |
| | | |
| | | |
| | | | |
* commit 'fbde407e4c72965aae4ea6dff7493e30af307ca5':
Enable printf format argument checking.
|
| | | |\ \ |
|
| | | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The original attempt missed the fact that Print is a member function,
so the first argument is the implicit 'this'.
Change-Id: I963b668c5432804c767f0a2e3ef7dea5978a1218
|
| |\| | |
| | | |
| | | |
| | | |
| | | | |
* commit '0d4f2b6d9ad1c5980f3ece965c4c4a49726c29f4':
Remove the fixed screen size assumptions.
|
| | |\| |
| | | |
| | | |
| | | |
| | | | |
* commit '900c9a61dee1511c9f4086ea5a3a3632b944cc0e':
Remove the fixed screen size assumptions.
|
| | | |\ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Dynamically allocate the text and menu arrays instead.
Change-Id: Idbfc3fe4e4b50db4fee62ac2b6a7323cad369749
|
| |\| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '72ba6264468573c21cc6bade65172be549f5b034':
Remove a couple of unused inlines from minzip/Zip.h.
|
| | |\| | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '64346eae51861356f8bf0f50e68dfeb9e1d04052':
Remove a couple of unused inlines from minzip/Zip.h.
|
| | | |\ \ \
| | | |/ /
| | |/| | |
|
| | | |/ /
| | | |
| | | |
| | | | |
Change-Id: I805883e3863673416898bdef39c5703ca33f18e0
|
| |\| | |
| | | |
| | | |
| | | |
| | | | |
* commit '0a7c16948b9750c0c063676cefce1f1354f9c971':
Rotate logs only when there are actual operations
|
| | |\| |
| | | |
| | | |
| | | |
| | | | |
* commit 'ca7bf53189c70ef0f687d54d772e5eaadc0b1c7c':
Rotate logs only when there are actual operations
|
| | | |\ \ |
|
| | | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Currently it rotates the log files every time it boots into the recovery
mode. We lose useful logs after ten times. This CL changes the rotation
condition so that it will rotate only if it performs some actual
operations that modify the flash (installs, wipes, sideloads and etc).
Bug: 19695622
Change-Id: Ie708ad955ef31aa500b6590c65faa72391705940
|
| |\| | |
| | | |
| | | |
| | | |
| | | | |
* commit '575e37394ec9dc2ff0b098c7a6fe8e3f95c4808f':
always use volume mount option when mounting a partition
|
| | |\| |
| | | |
| | | |
| | | |
| | | | |
* commit '6896f9d47db1f959a907d2e67e55860af23e65f8':
always use volume mount option when mounting a partition
|
| | | |\ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
From ROS, if enable adb using the vol.up and vol.down buttons, the
/system partition is mounted by the function ensure_path_mounted() but
with hardcoded mount options. As a consequence, the blocks are
modified and the reboot in MOS is blocked by the dm_verity feature
that detects a corruption.
This patch forces the function ensure_path_mounted() to use the mount
options from the volume structure, that were previously read from the
fstab.
Change-Id: I748d32c14cb821f4aae5bcc430089dab45375515
Signed-off-by: Gaelle Nassiet <gaellex.nassiet@intel.com>
Signed-off-by: Jeremy Compostella <jeremy.compostella@intel.com>
|
| |\| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '8cd389c80568ff46c18c7f7a59396562a6cf7f59':
Refactor the codes to call wipe_data/wipe_cache functions
|
| | |\| | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit 'ccc82eca9a9b63f43c69472c0841954f19f7a7f0':
Refactor the codes to call wipe_data/wipe_cache functions
|
| | | |\ \ \ |
|
| | | |/ / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
It also changes the return type of wipe_data/wipe_cache to bool, so the
caller can get the status accordingly.
Change-Id: I3022dcdadd6504dac757a52c2932d1176ffd1918
|
| |\| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '9e1bba1f5f53f366bfec995a89e362c3b897cb37':
Revert "Erase PST partition if its marked to be erased."
|
| | |\| | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '9295980ac1554ff7c30531298aadec0750b027e0':
Revert "Erase PST partition if its marked to be erased."
|
| | | |\ \ \ |
|
| | | |/ / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This now gets done at the framework level.
Doing it here breaks the signature on the partition.
This reverts commit ee19387905650cab5da7dd97ada5502cd17ac93d.
Bug: 19967123
Change-Id: I2a977cb0f0ba94defa1bf9091219398ddc1d3528
(cherry picked from commit 037444642bc32d8fed3bb996823b6a62faa57195)
|
| |\| | | |
| | | | |
| | | | |
| | | | | |
Change-Id: Ib2395d806bb8c029f7743c36cb7849e5589fad7b
|
| | |\| | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '20e82d4fb6b4ba8520bd46db2982495f0b627ed1':
Add support to enter sideload mode directly
|
| | | |\ \ \ |
|
| | | |/ / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
When the command file contains "--sideload" (as a result of 'adb reboot
sideload'), it goes into sideload mode directly. Text display will be
turned on by default. It waits for user interaction upon finishing.
When the command file contains "--sideload_auto_reboot", it enters
sideload mode silently. And it will reboot after the installation
regardless of its result, which is designed for automated testing purpose.
Change-Id: Ifdf173351221c7bbf635cfd32463b48e1fff5740
|
| |/ / / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This now gets done at the framework level.
Doing it here breaks the signature on the partition.
This reverts commit ee19387905650cab5da7dd97ada5502cd17ac93d.
Bug: 19967123
Change-Id: I447b926b733ca145f11a916d9569ce39889db627
|
| |\| | |
| | | |
| | | |
| | | |
| | | | |
* commit 'dac2486514ef7b794610e929fd5615d98c9c1932':
Factor out the "yes/no" menu and use it for "Wipe cache" too.
|
| | |\ \ \ |
|
| | |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
It's surprising that only one of the wipe options asks for confirmation.
This change makes it easier to add confirmation to any action.
I've also removed the version information from all but the main menu,
because I find I'm not really reading the red text because there's
so much of it all the time.
(Given that fingerprints are long and menu items aren't wrapped, we
might want to go with an actual "About" menu item instead.)
Change-Id: I7d809fdd53f9af32efc78bee618f98a69883fffe
|
| |\| | |
| | | |
| | | |
| | | |
| | | | |
* commit '43b80810284bd0eb43a4488044f902c910c9f3b2':
Factor out option variables from int to bool types
|
| | |\ \ \ |
|
| | |/ / /
| | | |
| | | |
| | | | |
Change-Id: Ia897aa43e44d115bde6de91789b35723826ace22
|
| |\| | |
| | | |
| | | |
| | | |
| | | | |
* commit 'e31f956597f758154a5f6ca7a5793230c8eff936':
Remove support for Cupcake kernels.
|
| | |\ \ \ |
|
| | |/ / /
| | | |
| | | |
| | | | |
Change-Id: I7376b9d3c1e11d19e164072d6e9d09c1183114a0
|
| |\| | |
| | | |
| | | |
| | | |
| | | | |
* commit '9460bb2c3df9e985c14d2dd76b03aefb3333b251':
Fix recovery image text rendering.
|
| | |\ \ \ |
|
| | |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Previously most devices would lose the character before a line wrap.
The log's text rendering was starting at offset 4 but none of the
arithmetic was taking this into account. It just happened to work
on the Nexus 9's 1536-pixel wide display (1536/18=85.3) but not on
a device such as the Nexus 5 (1080/18=60).
The only active part of this change is the change from 4 to 0 in the
gr_text call. The rest is just a few bits of trivial cleanup while I
was working out what was going on.
Change-Id: I9279ae323c77bc8b6ea87dc0fe009aaaec6bfa0e
|
| |\| | |
| | | |
| | | |
| | | |
| | | | |
* commit '47733eafdc37203d59a8a0a17ccfb936d2920e31':
Fix wipe command when using sideload in recovery
|
| | |\ \ \
| | |/ /
| |/| | |
|
| | |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Add support for the wipe command when using sideload within the
recovery. All the support for this command is in place, only the
execution of the actual wipe command itself was missing.
Change-Id: Ia9cdfc912bfb9f558fa89b9f0ed54e843ede41f2
Signed-off-by: Christian Poetzsch <christian.potzsch@imgtec.com>
|
| |\| |
| | |
| | |
| | |
| | | |
* commit '733deb267db3488be408cbe020769108ee6584b0':
Make the recovery menus wrap.
|
| | |\ \ |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The real problem is that the recovery UI is sluggish. But being able
to wrap off the top to the bottom halves the maximum distance you'll
have to go.
Change-Id: Ifebe5b818f9c9a1c4187d4ac609422da1f38537f
|
| |\| | |
| | | |
| | | |
| | | |
| | | | |
* commit '31e4787634a59d32ff80ccd684bc439cecc4d8c8':
Always use strerror to report errno in recovery.
|
| | |\ \ \
| | |/ /
| |/| | |
|
| | |/ /
| | |
| | |
| | | |
Change-Id: I7009959043150fabf5853a43ee2448c7fbea176e
|
| |\| |
| | |
| | |
| | |
| | | |
* commit 'e944944fa58f66dad5483b6ee1ea9a2c0f9bedd2':
Add "Apply update from sdcard" to default recovery image.
|
| | |\ \ |
|
| | |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| |\| |
| | |
| | |
| | |
| | | |
* commit '8c637903fedafd0acdc3906f42032f2e88cd1f7f':
Remove unused libutils references.
|
| | |\ \ |
|
| | |/ /
| | |
| | |
| | | |
Change-Id: I22797643103ce1d4371198433ad9849cc83d3d7c
|
| |\| | |
|
| | |\ \
| | | |
| | | |
| | | |
| | | | |
* commit 'd5369e5d91c9c7c55cbd8f1c306098182c209baf':
updater: Check the return value from ApplyImagePatch / ApplyBSDiffPatch
|
| | | |\|
| | | |
| | | |
| | | |
| | | | |
* commit '18f371d814b26132aadf11de6cc305f02484535a':
updater: Check the return value from ApplyImagePatch / ApplyBSDiffPatch
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Return NULL to abort the update process. Note that returning ""
won't stop the script.
Change-Id: Ifd108c1356f7c92a905c8776247a8842c6445319
|
| | |\| |
| | | |
| | | |
| | | |
| | | | |
* commit 'cc368fdea6e5415be541dadfe04107b76a82c537':
Install the recovery binary directly to the recovery image.
|
| | | |\ \
| |_|/ /
|/| | |
| | | |
| | | | |
* commit '8290aa501f1b0354262c304962bc4da2e30457a8':
Install the recovery binary directly to the recovery image.
|
| |\ \ \ \ |
|
| |/ / / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This eliminated the previous hack, that doesn't work reliably with the
"LOCAL_REQUIRED_MODULES := mkfs.f2fs".
Bug: 19666886
Change-Id: I1f0a2d41129f402c0165f3b86b6fda077291f282
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This eliminated the previous hack, that doesn't work reliably with the
"LOCAL_REQUIRED_MODULES := mkfs.f2fs".
Bug: 19666886
Change-Id: I1f0a2d41129f402c0165f3b86b6fda077291f282
|
| | |\| |
| | | |
| | | |
| | | |
| | | | |
* commit 'fb7d896595d1fefe0b73bbebb1e4a0c027e4fab7':
Remove more dead code from minzip.
|
| | | |\ \
| |_|/ /
|/| | |
| | | |
| | | | |
* commit '023e4374469b8cae68783036b6977ea721c1e07a':
Remove more dead code from minzip.
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '579b92991ccd626527c75042aca032d3ac4207a2':
Remove more dead code from minzip.
|
| | |\ \ \ \ |
|
| | |/ / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| | | |\| |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '66f94728ef2f4ac09c42c4623ec45d5eac6e9d53':
Add tests for read_block_adb.
|
| | | | |\ \
| |_|_|/ /
|/| | | |
| | | | |
| | | | | |
* commit '3deba524f9d1e94b613d9c13f4c76595f0ec99ab':
Add tests for read_block_adb.
|
| |\| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit 'ecead276f068cb53bddb2458b200aa96473ddfb3':
Add tests for read_block_adb.
|
| | |\ \ \ \ |
|
| | |/ / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| | | |\| |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '0257d107f2039e24e4fbdd98d7536f402628bd78':
Bump up max_map_count value.
|
| | | | |\|
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '71c454293118c51487a62c5d7c4da6262eae691c':
Bump up max_map_count value.
|
| | | | | |\
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* commit 'f66bf33956eebba26bedc7f098dedc8a2c1cf942':
Bump up max_map_count value.
|
| | | | | | |\
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* commit '3e91f691a6bf6b154ea98982b073e84e86328baf':
Bump up max_map_count value.
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Change-Id: Id3e2c0795b817db9a85bc84cba2aa05d20179d39
Bug: 18503789
(cherry picked from commit 5bf74b238b402eaaf8c5bd1663fe4d592e59421f)
|
| | | |\| | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* commit '9b14c4b0e8b8b102c699b554d701e461e7e562e7':
This read accidentally got turned in to a write.
|
| | | | |\ \ \ \
| |_|_|/ / / /
|/| | | | | |
| | | | | | |
| | | | | | | |
* commit '735a0f0fc3de936db3ce5a99dbcf02e970d47ba0':
This read accidentally got turned in to a write.
|
| |\| | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* commit 'cab0beb95adce79b0c33488b5a503cac7dca6e77':
This read accidentally got turned in to a write.
|
| | |\ \ \ \ \ \ |
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Too many mechanical changes in a row...
Bug: 19522788
Change-Id: Ic451792aab2700cdbdbb64529b99ff5f567918ad
|
| | | | |\| | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* commit 'd9bbeaec5a12074928f026af47de2b92f2a34336':
Drop hardcoded LOCAL_C_INCLUDES from minui/Android.mk
|
| | | | | |\ \ \ \
| |_|_|_|/ / / /
|/| | | | | | |
| | | | | | | |
| | | | | | | | |
* commit '83e5d1dc73116a154cd7387547c8dd858fd497aa':
Drop hardcoded LOCAL_C_INCLUDES from minui/Android.mk
|
| |\| | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* commit 'c9bc3cc92a2c2f584b28049238c4a583c80f149d':
Drop hardcoded LOCAL_C_INCLUDES from minui/Android.mk
|
| | |\ \ \ \ \ \ \
| | |/ / / / / /
| |/| | | | | | |
|
| | |/ / / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The zlib include was not required. libpng is now handled by referencing
the libpng static library
Change-Id: Ie4e0abad3fff5b763eba363d3d0fa96128ff49bc
|
| | | |\| | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* commit '381f64165153bfd4747b99baf838fa280d402d5e':
Fix readx/writex names.
|
| | | | |\ \ \ \
| |_|_|/ / / /
|/| | | | | |
| | | | | | |
| | | | | | | |
* commit 'eef962bfd90f11ef2f936e57270c85293af60e5f':
Fix readx/writex names.
|
| |\| | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* commit '9255ad4a4f46dc7781b180d0cffce2d616adebcf':
Fix readx/writex names.
|
| | |\ \ \ \ \ \ |
|
| | |/ / / / / /
| | | | | | |
| | | | | | |
| | | | | | | |
Change-Id: I9556960b8293ea0e81def8b73f88edadb68841e3
|
| | | |\| | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* commit '94cb7fdc45db013c0ad6b8edc536717c6eb812a8':
Remove _(GNU|XOPEN)_SORUCE makefile cruft.
|
| | | | |\ \ \ \
| |_|_|/ / / /
|/| | | | | |
| | | | | | |
| | | | | | | |
* commit 'd795dcc5ead7328c1b3fcb14e279c4bec6a38b50':
Remove _(GNU|XOPEN)_SORUCE makefile cruft.
|
| |\| | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* commit '12fa5191e76d119f4f3998a4b8821f87aa4f9fad':
Remove _(GNU|XOPEN)_SORUCE makefile cruft.
|
| | |\ \ \ \ \ \ |
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
None of the functions needing these are used.
Change-Id: Ibe3ca24d993788bf2f1108bac8417a7094ef386b
|
| | | | |\| | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* commit '07d2542d870d4bb92c9cfb85bd0ac8f9bf7ba4c4':
Fix LP64 build for minadbd.
|
| | | | | |\ \ \ \
| |_|_|_|/ / / /
|/| | | | | | |
| | | | | | | |
| | | | | | | | |
* commit 'b3f4ed86e95a1270258b288cfb22c42c6f163efc':
Fix LP64 build for minadbd.
|
| |\| | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* commit '82eea3fdd77f458e94d87ef0db0bd3b745d096ff':
Fix LP64 build for minadbd.
|
| | |\ \ \ \ \ \ \
| | |/ / / / / /
| |/| | | | | | |
|
| | |/ / / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
services.c:57:12: error: format '%llu' expects argument of type 'long
long unsigned int', but argument 2 has type 'uint64_t' [-Werror=format=]
Change-Id: Ieba691bf9e7a30c8bb38f4e1f36e86b6ea3f8c80
|
| | | |\| | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* commit '8007a21e799ec05a45435d4b688116e88de98221':
Fix build from implicit declaration.
|
| | | | |\ \ \ \
| |_|_|/ / / /
|/| | | | | |
| | | | | | |
| | | | | | | |
* commit '6deb3d5cf266ce18aefb819c5994f504e0df103b':
Fix build from implicit declaration.
|
| |\| | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* commit '35fbf7876059b64d069d60fd9eab761718344271':
Fix build from implicit declaration.
|
| | |\ \ \ \ \ \ |
|
| | |/ / / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Turn the warning on by default and turn on -Werror so this doesn't
happen next time.
Change-Id: Id65bf0cb63bbf0ff224655b425463ae2f55435df
|
| | | |\| | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* commit '218dab7fdafbc613aa54d1fad0de0dcadd575186':
Delete unused functions from minzip.
|
| | | | |\ \ \ \
| |_|_|/ / / /
|/| | | | | |
| | | | | | |
| | | | | | | |
* commit '6f58e899be728fc2ab3cf3902e52937ebd58e02d':
Delete unused functions from minzip.
|
| |\| | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* commit '829d392a75f536861adfddefc21ec635f3460144':
Delete unused functions from minzip.
|
| | |\ \ \ \ \ \ |
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
This is in preparation of replacing it with libziparchive and
providing shim wrappers.
bug: 19472796
Change-Id: I1f2fb59ee7a41434e794e4ed15b754aa2b74a11d
|
| | | | |\| | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* commit '37e68a1d800cbe6eb28c3405fb3ecccb0119e03e':
Fix a printf format warning.
|
| | | | | |\ \ \ \
| |_|_|_|/ / / /
|/| | | | | | |
| | | | | | | |
| | | | | | | | |
* commit 'f9ee77ab52941e6f3be8e97fb0a150480ea8760a':
Fix a printf format warning.
|
| |\| | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* commit '9e95c515dc2e7afa91d4a4c5163ffd5b6eae3b31':
Fix a printf format warning.
|
| | |\ \ \ \ \ \ \
| | |/ / / / / /
| |/| | | | | | |
|
| | |/ / / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
warning: format '%lu' expects argument of type 'long unsigned int', but
argument 3 has type 'unsigned int' [-Wformat] sizeof(RangeSet) + num * sizeof(int));
Change-Id: I4a3c6fc8d40c08ea84f8f5ee13f39350e4264027
|
| | | |\| | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* commit 'dda456b5da3d59a71b486aa85912dec65b3089b2':
Kill of most of the remainder of minadbd.
|
| | | | |\ \ \ \
| |_|_|/ / / /
|/| | | | | |
| | | | | | |
| | | | | | | |
* commit '552fceb85cde45581ef04a23a2e76e6298ed15a5':
Kill of most of the remainder of minadbd.
|
| |\| | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* commit '2d1022250941873f8748e6a159d4e5bf976e511f':
Kill of most of the remainder of minadbd.
|
| | |\ \ \ \ \ \ |
|
| | |/ / / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
I think everything left now is here to stay (services.c might get
massaged in to libadbd if it gets refactored).
Bug: 17626262
Change-Id: I01faf8b277a601a40e3a0f4c3b8206c97f1d2ce6
|
| | | |\| | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* commit 'a1df1a778826742eeef11ed449bcffb95e119c80':
|
| | | | |\ \ \ \
| |_|_|/ / / /
|/| | | | | |
| | | | | | | |
* commit 'c2b60b9870955c14ec8434353d617ebca6f44368':
|
| |\ \ \ \ \ \ \
| |/ / / / / /
|/| | | | | | |
|
| | | |\| | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* commit '9613bd32f5d19476063e4c546ad806385eed203c':
Move adb_main to its own file.
|
| | | | |\ \ \ \
| |_|_|/ / / /
|/| | | | | |
| | | | | | |
| | | | | | | |
* commit '4eb6c71e7f013e684828ae6216f61b83be552282':
Move adb_main to its own file.
|
| |\ \ \ \ \ \ \ |
|
| |/ / / / / / /
| | | | | | |
| | | | | | |
| | | | | | | |
Change-Id: Ia5150e1ef8be5a8f2d2da0fdca9383e22218f4ac
|
| | | |\| | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* commit '91f68a4735e7ca9facaf0bad45a97e7ea25213c4':
Remove dead code.
|
| | | | |\ \ \ \
| |_|_|/ / / /
|/| | | | | |
| | | | | | |
| | | | | | | |
* commit '5d22a5b5ecfd9fce5084915e65e114c8541c084c':
Remove dead code.
|
| |\ \ \ \ \ \ \ |
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
This code doesn't exist in the normal adb, so it just makes it harder
to diff the two.
Change-Id: Ibb21b49bb9944c4245199536cbe88e8a107cf00d
|
| | | | |\| | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* commit '43162fe50cb2e2e7861df97380fad815a54dac2e':
Use headers from adb.
|
| | | | | |\ \ \ \
| |_|_|_|/ / / /
|/| | | | | | |
| | | | | | | |
| | | | | | | | |
* commit '076f5479b592fc02f2f3e5436cad06b0a35d0521':
Use headers from adb.
|
| |\| | | | | | | |
|
| |/ / / / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
adb.h has diverged a bit, so that one will be more involved, but these
three are all trivial, unimportant changes.
Change-Id: Ief8474c1c2927d7e955adf04f887c76ab37077a6
|
| | | |\| | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* commit '61398da24b7abe657fad0a0db2a47cf940f4e58b':
Remove unused code.
|
| | | | |\ \ \ \
| |_|_|/ / / /
|/| | | | | |
| | | | | | |
| | | | | | | |
* commit 'bbf627a68e47319b1fcacb1487ab1d1618c3a82d':
Remove unused code.
|
| |\ \ \ \ \ \ \ |
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Change-Id: Ie37734e75bc4d1e284dcb5dee4c0512021663dbd
|
| | | | |\| | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* commit 'bf1476defee29ebb3f2b794ce82f2614ba59ce4f':
Lose USB transport code to libadb.
|
| | | | | |\ \ \ \
| |_|_|_|/ / / /
|/| | | | | | |
| | | | | | | |
| | | | | | | | |
* commit '4db055d66a3d4d8be9f61beb5ee4d25f6346191a':
Lose USB transport code to libadb.
|
| |\| | | | | | | |
|
| |/ / / / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Bug: 17626262
Change-Id: If41031ba20a3a75fa510f155c654a482b47e409d
|
| | | |\| | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* commit 'ecb0ad25c6be87570f31b652c24ff7f17a93813f':
Add extern "C" to all the headers.
|
| | | |/| | | |
| |/|/ / / /
| |/| | | |
|/| | | | |
| | | | | | |
* commit '37e933a7cef7f2df1693ff02d34042bc2f039301':
Add extern "C" to all the headers.
|
| |\ \ \ \ \ \ |
|
| |/ / / / / /
| | | | | |
| | | | | |
| | | | | | |
Change-Id: Idc249ff1b199b7c455f90092ff2c8a48b539faf4
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Change-Id: I480c02ffedd811f4dda9940ef979a05ff54f1435
Bug: 19410117
|
| | | |\ \ \ \
| | |/ / / /
| |/| | | |
| | | | | |
| | | | | | |
* commit 'f8dd04e1a5f94e7accf65a5375114ac7fa73f828':
Fix Droid and animation color in recovery mode
|
| | |\ \ \ \ \
| |/ / / / /
|/| | | | |
| | | | | |
| | | | | | |
* commit 'ff934d0257909e9c5420815547a6e2ff89455314':
Fix Droid and animation color in recovery mode
|
| |\ \ \ \ \ \ |
|
| |/ / / / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
[Problem]
Droid and animation color in recovery mode are incorrect
[Modify]
- Add support for flipping (zero copy) with RECOVERY_ABGR.
- Decodes PNG files to BGRA directly, and other fills, text and alpha blending are also done directly in BGRA (i.e. blits can still bypass conversion)
- Remove the BGRA workaround added previous for single buffer mode (f766396)
Bug:19216535
Change-Id: Ie864419fc6da776ff58b2d02e130f203c194500f
Signed-off-by: Tony Kuo <tony.kuo@mediatek.com>
|
| | | |\ \ \ \
| | |/ / / /
| |/| | | |
| | | | | |
| | | | | | |
* commit 'adf71bf71d0c3ecb68375c44fc8646860217024c':
Fix build when TARGET_USERIMAGES_USE_EXT4 is not defined
|
| | |\ \ \ \ \
| |/ / / / /
|/| | | | |
| | | | | |
| | | | | | |
* commit '5db3f97877c0aafd4513c3ed846c48b0fc148b0e':
Fix build when TARGET_USERIMAGES_USE_EXT4 is not defined
|
| |\ \ \ \ \ \ |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The cryptfs.h files is always included, but its path is only included when TARGET_USERIMAGES_USE_EXT4 is defined.
Change-Id: Iec6aa4601a56a1feac456a21a53a08557dc1d00d
|
| | | | |\ \ \ \
| | | |/ / / /
| | |/| | | |
| | | | | | |
| | | | | | | |
* commit '98e2c509a636db7c4d9a89c086e8d4ac03a6970b':
recovery: Handle EV_SW events
|
| | | |\ \ \ \ \
| |_|/ / / / /
|/| | | | | |
| | | | | | |
| | | | | | | |
* commit '78aa50d3499e105d04e37ae3d3d92dad0d2c711c':
recovery: Handle EV_SW events
|
| |\ \ \ \ \ \ \ |
|
| |/ / / / / / /
| | | | | | |
| | | | | | |
| | | | | | | |
Change-Id: I29c13a941067cd1bbdced3bd67fd93293347d7b6
|
| | | | |\ \ \ \
| | | |/ / / /
| | |/| | | |
| | | | | | |
| | | | | | | |
* commit 'ee7127cca575967a90f3ede92cd05552000ccb14':
recovery: Generate libminui dynamic library
|
| | | |\ \ \ \ \
| |_|/ / / / /
|/| | | | | |
| | | | | | |
| | | | | | | |
* commit 'bf0be350ddf4fb75178f33ee64706cb795ceade0':
recovery: Generate libminui dynamic library
|
| |\ \ \ \ \ \ \ |
|
| |/ / / / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Allow factory test images to use minui functionaltiy
by making use of libminui dynamic library.
Change-Id: I63e77420d5addbcc6eebeedc213f629085766b4c
|
| | | | |\ \ \ \
| | | |/ / / /
| | |/| | | |
| | | | | | |
| | | | | | | |
* commit 'dcbf4fc571236bf5aa5286294b3c727be725db70':
recovery: Properly detect userdebug or eng builds
|
| | | |\ \ \ \ \
| |_|/ / / / /
|/| | | | | |
| | | | | | | |
Change-Id: I6f2ea07df2ab80a44301d9c3a2a8841c40a46002
|
| |\ \ \ \ \ \ \ |
|
| |/ / / / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The recovery system behaves a little bit differently on userdebug or
eng builds by presenting error reports to the user in the ui.
This is controlled by checking the build fingerprint for the string
:userdebug/ or :eng/. But with AOSP version numbers most AOSP
builds blows the 92 char limit of ro.build.fingerprint and therefore
the property is not set, so this condition will always be evaluated
to false, for most builds.
Instead of depending on the flaky ro.build.fingerprint this change
uses ro.debuggable.
Change-Id: I74bc00c655ac596aaf4b488ecea58f0a8de9c26b
|
| | | | |\ \ \ \
| | | |/ / / /
| | |/| | | |
| | | | | | |
| | | | | | | |
* commit 'ec5c1c1e291062576925b80b532d36df118103f5':
Remove dead/unused code and realign some of the comments to make it more cleaner and easier to read
|
| | | |\ \ \ \ \
| |_|/ / / / /
|/| | | | | |
| | | | | | |
| | | | | | | |
* commit '99e084ca8012bc7af52ae2fb9e72ab7180177daf':
Remove dead/unused code and realign some of the comments to make it more cleaner and easier to read
|
| |\ \ \ \ \ \ \ |
|
| |/ / / / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
to make it more cleaner and easier to read
Change-Id: If536d482c0ed645368084e76d8ec060f05d89137
Signed-off-by: Nanik Tolaram <nanikjava@gmail.com>
|
| | | | |\ \ \ \
| | | |/ / / /
| | |/| | | |
| | | | | | |
| | | | | | | |
* commit '42b09d255afdb47bc0546183cbc68e86147baaab':
There's no GPL code in 'updater'.
|
| | | |\ \ \ \ \
| |_|/ / / / /
|/| | | | | |
| | | | | | |
| | | | | | | |
* commit '6a0d2fbcaa1740da7bb0e7a0ef8280e8b7b9bb05':
There's no GPL code in 'updater'.
|
| |\ \ \ \ \ \ \ |
|
| |/ / / / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
This notice was added for libsyspatch and libxdelta3, but that code
has been removed since.
Change-Id: I4008878ded56ca1d5094a8208728f8c02fe1fe03
|
| | | | |\ \ \ \ |
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Add support for transfer list version 3, which allows us to
verify the status of each command and resume an interrupted
block based OTA update. Notes on the changes:
- Move the previous BlockImageUpdateFn to a shorter and
reusable PerformBlockImageUpdate, which can be used also
in BlockImageVerifyFn for verification.
- Split individual transfer list commands into separate
functions with unified parameters for clarity, and use
a hash table to locate them during execution.
- Move common block reading and writing to ReadBlocks and
WriteBlocks to reduce code duplication, and rename the
readblock and writeblock to less confusing read_all and
write_all.
The coding style of the new functions follows the existing
style in the updater/edify code.
Needs matching changes from
Ia5c56379f570047f10f0aa7373a1025439495c98
Bug: 18262110
Change-Id: I1e752464134aeb2d396946348e6041acabe13942
|
| | | | |\ \ \ \ \
| | | |/ / / / /
| | |/| / / / /
| | | |/ / / /
| | | | | | | |
* commit '40862ab59e376d50036fa56a9f3f08c42530c96a':
Add missing includes.
|
| | | |\ \ \ \ \
| |_|/ / / / /
|/| | | | | |
| | | | | | |
| | | | | | | |
* commit 'aeecac5444ce55d2e82ee1b2aa35ff61a038c14e':
Add missing includes.
|
| |\ \ \ \ \ \ \ |
|
| |/ / / / / / /
| | | | | | |
| | | | | | |
| | | | | | | |
Change-Id: I06ea08400efa511e627be37a4fd70fbdfadea2e6
|
| | | | |\ \ \ \
| | | |/ / / /
| | |/| | | |
| | | | | | |
| | | | | | | |
* commit '22b8fe96663de518bf77049a1e449430b66e7d11':
Add missing includes.
|
| | | |\ \ \ \ \
| |_|/ / / / /
|/| | | | | |
| | | | | | |
| | | | | | | |
* commit 'dab56cac959ce9c78e3a0a22e9ee2ff917d61bd3':
Add missing includes.
|
| |\ \ \ \ \ \ \ |
|
| |/ / / / / / /
| | | | | | |
| | | | | | |
| | | | | | | |
Change-Id: I0737456e0221ebe9cc854d65c95a7d37d0869d56
|
| | | | |\ \ \ \
| | | |/ / / /
| | |/| | | |
| | | | | | |
| | | | | | | |
* commit '88c30fb652ad40835f1d1045e2c851ff8813e873':
Start losing code to libadb.
|
| | | |\ \ \ \ \
| |_|/ / / / /
|/| | | | | |
| | | | | | |
| | | | | | | |
* commit 'eaeb55f745c86487b4ad57da008d501fa1ebc37d':
Start losing code to libadb.
|
| |\ \ \ \ \ \ \ |
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Bug: 17626262
Change-Id: I8ce7cff2b7789f39f35a4211d7120d072c05a863
|
| | | | | |\ \ \ \
| | | | |/ / / /
| | | |/| | | |
| | | | | | | |
| | | | | | | | |
* commit '2d67a483ede93f1d3906e1d03f46af34887764ac':
Fix the v2 descriptor handling.
|
| | | | |\ \ \ \ \
| |_|_|/ / / / /
|/| | | | | | |
| | | | | | | |
| | | | | | | | |
* commit 'cdc38d0401f2798bb13e73d6ca290abab60fc2bf':
Fix the v2 descriptor handling.
|
| |\ \ \ \ \ \ \ \ |
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
There was a misinterpretation of how the v2 header works. The flags
in the header indicate what is in the rest of the structure.
Bug: 19127803
Change-Id: I83fd93df1df196300a80ddeb3b49ca7851ffcfb8
|
| | | | | | |\ \ \ \
| | | | | |/ / / /
| | | | |/| | | |
| | | | | | | | |
| | | | | | | | | |
* commit 'efa16af53ebc3ef4974ff791d0f03ec66b20a5e8':
adbd: Support for new f_fs descriptor format
|
| | | | | |\ \ \ \ \
| |_|_|_|/ / / / /
|/| | | | | | | |
| | | | | | | | |
| | | | | | | | | |
* commit 'cad5ce81adb28e131f2521fa5e553e222e0a19f4':
adbd: Support for new f_fs descriptor format
|
| |\| | | | | | | | |
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
The patch "[RFC] usb: gadget: f_fs: Add flags
to descriptors block" marks the current
usb_functionfs_descs_head format deprecated
and introduces support for sending SuperSpeed
descriptors.
This CL makes adbd to send Descriptors in the
new format. Adbd would fall back to the old
format, if kernel is not able to recognize
the new format. This is done to prevent
adbd from breaking in the older versions
of the kernel.
Bug: 17394972
(cherry picked from commit b5b43043fa71f9cb620ddd02ec2bc98eced5a6ce)
Change-Id: I5af9dc9d4f41ad47d678279054a648f69497b24e
|
| | | | | | |\ \ \ \
| | | | | |/ / / /
| | | | |/| | | |
| | | | | | | | |
| | | | | | | | | |
* commit '4db9c8935df6347e54aa9581f019a802d2ec7dad':
Add missing <string.h> include.
|
| | | | | |\ \ \ \ \
| |_|_|_|/ / / / /
|/| | | | | | | |
| | | | | | | | |
| | | | | | | | | |
* commit 'd40699287fb659eca92b93dd325f82babcef77e6':
Add missing <string.h> include.
|
| |\ \ \ \ \ \ \ \ \
| |/ / / / / / / /
|/| | | | | | | | |
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Change-Id: I79a9a58904b2992c306d8de0c7b3a4aacd4b67e0
|
| | | | | | |\ \ \ \
| | | | | |/ / / /
| | | | |/| | | |
| | | | | | | | |
| | | | | | | | | |
* commit 'e84e931040a4f77aea14aca4c756940f3891d977':
Remove superfluous OpenSSL include paths.
|
| | | | | |\ \ \ \ \
| |_|_|_|/ / / / /
|/| | | | | | | |
| | | | | | | | |
| | | | | | | | | |
* commit 'eade3a800effe8f8fb89c8a2da12831bc5ba3239':
Remove superfluous OpenSSL include paths.
|
| |\ \ \ \ \ \ \ \ \
| |/ / / / / / / /
|/| | | | | | | | |
|
| |/ / / / / / / /
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
This include path was needed because system/vold/cryptfs.h included an
OpenSSL header just to get the length of a SHA-256 hash. This has been
fixed in https://android-review.googlesource.com/#/c/124477/1.
Change-Id: I06a8ba0ee5b9efcc3260598f07d9819f065711de
|
| | | | | |\ \ \ \
| | | | |/ / / /
| | | |/| | | |
| | | | | | | |
| | | | | | | | |
* commit '465e8702912d06b7207878eb38b0df6f56f8bbb6':
Bump up max_map_count value.
|
| | | | |\ \ \ \ \
| | | | | |/ / /
| | | | |/| | |
| | | | | | | |
| | | | | | | | |
* commit '5bf74b238b402eaaf8c5bd1663fe4d592e59421f':
Bump up max_map_count value.
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Change-Id: Id3e2c0795b817db9a85bc84cba2aa05d20179d39
Bug: 18503789
|
| | | | | | |\ \ \
| | | | |_|/ / /
| | | |/| | | |
| | | | | | | |
| | | | | | | | |
* commit '479e510811b8a81c47449faa8db6ed5d1d7a31b4':
Use getmntent when accessing /proc/mounts.
|
| | | | |\ \ \ \ \
| |_|_|/ / / / /
|/| | | | | | |
| | | | | | | |
| | | | | | | | |
* commit 'dd719dfe4eb1d8c15342ce05d2a0ab975c390d67':
Use getmntent when accessing /proc/mounts.
|
| |\ \ \ \ \ \ \ \ |
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Bug: 18887435
Change-Id: Ice44c14fc8ee79eab259caf486e123b6af21ceb0
|
| | | | | | | |\ \ \
| | | | | |_|/ / /
| | | | |/| | | |
| | | | | | | | |
| | | | | | | | | |
* commit '6bec0e51b0974d5646bab925299ea37c221b47e3':
Remove an uninitialized value.
|
| | | | | |\ \ \ \ \
| |_|_|_|/ / / / /
|/| | | | | | | |
| | | | | | | | |
| | | | | | | | | |
* commit 'a5d63956c419f01a9e57414c23d3ded3a16e0f8a':
Remove an uninitialized value.
|
| |\ \ \ \ \ \ \ \ \
| |/ / / / / / / /
|/| | | | | | | | |
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
The assignment of this value was removed in 0d32f25, but the
declaration was still there and still tested. Clang issues a warning
for this.
Change-Id: I748bfb8b4f78ceed1c1b5b1bb80cb4e873e4facc
|
| | | | | | | |\ \ \
| | | | | |_|/ / /
| | | | |/| | | |
| | | | | | | | |
| | | | | | | | | |
* commit '6bb8f476862db17adb6f69b441af9059b01c9108':
Fix missing #includes in bootable/recovery.
|
| | | | | |\ \ \ \ \
| |_|_|_|/ / / / /
|/| | | | | | | |
| | | | | | | | |
| | | | | | | | | |
* commit '538d7d838d82e29c738145431aa64c587dc84943':
Fix missing #includes in bootable/recovery.
|
| |\ \ \ \ \ \ \ \ \
| |/ / / / / / / /
|/| | | | | | | | |
|
| |/ / / / / / / /
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Change-Id: I58dfbac6ca1aa80d3659f53a8fad1bbbbdc9b941
|
| | | | | | |\ \ \
| | | | |_|/ / /
| | | |/| | | |
| | | | | | | |
| | | | | | | | |
* commit '8af7c5df575b1aef496694effea19700f6c71d65':
Add O_CREAT option for open
|
| | | | |\| | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* commit 'a72512cd058da7de4cdb667776ed47fad873f12c':
Add O_CREAT option for open
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Factory reset fails if there is no file, for example, RECOVERY_COMMAND_FILE_TMP.
So create file as adding O_CREAT option if it does not exist.
error log:
--------- beginning of crash
12-10 02:35:17.190 3059 3059 F libc : Fatal signal 11 (SIGSEGV), code 1, fault addr 0x30 in tid 3059 (uncrypt)
12-10 02:35:17.296 766 1528 W NativeCrashListener: Couldn't find ProcessRecord for pid 3059
12-10 02:35:17.296 191 191 I DEBUG : *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***
12-10 02:35:17.296 191 191 E DEBUG : AM write failure (32 / Broken pipe)
12-10 02:35:17.296 191 191 I DEBUG : Build fingerprint: 'Android/aosp_hammerhead/hammerhead:5.1/LMP/hopemini12052127:userdebug/test-keys'
12-10 02:35:17.296 191 191 I DEBUG : Revision: '10'
12-10 02:35:17.297 191 191 I DEBUG : ABI: 'arm'
12-10 02:35:17.297 191 191 I DEBUG : pid: 3059, tid: 3059, name: uncrypt >>> /system/bin/uncrypt <<<
12-10 02:35:17.297 191 191 I DEBUG : signal 11 (SIGSEGV), code 1 (SEGV_MAPERR), fault addr 0x30
12-10 02:35:17.302 191 191 I DEBUG : r0 00000001 r1 be94b690 r2 fffffe90 r3 b6fdbf7c
12-10 02:35:17.302 191 191 I DEBUG : r4 00000000 r5 00000000 r6 b6fd8ca4 r7 be94b67c
12-10 02:35:17.302 191 191 I DEBUG : r8 00000000 r9 ffffffff sl b6ff582b fp be94b68d
12-10 02:35:17.302 191 191 I DEBUG : ip b6fcfd08 sp be94b648 lr b6f98fe5 pc b6f98fe4 cpsr 20070030
12-10 02:35:17.303 191 191 I DEBUG :
12-10 02:35:17.303 191 191 I DEBUG : backtrace:
12-10 02:35:17.303 191 191 I DEBUG : #00 pc 00032fe4 /system/lib/libc.so (fputs+29)
12-10 02:35:17.303 191 191 I DEBUG : #01 pc 000016a1 /system/bin/uncrypt
12-10 02:35:17.303 191 191 I DEBUG : #02 pc 0000114b /system/bin/uncrypt
12-10 02:35:17.303 191 191 I DEBUG : #03 pc 00012df5 /system/lib/libc.so (__libc_init+44)
12-10 02:35:17.303 191 191 I DEBUG : #04 pc 000013cc /system/bin/uncrypt
12-10 02:35:17.325 191 191 I DEBUG :
12-10 02:35:17.325 191 191 I DEBUG : Tombstone written to: /data/tombstones/tombstone_00
Bug: 18709330
Change-Id: Ib5dccdd366e829049938a188ea5f98d9e4e282db
|
| | | | | | |\ \ \
| | | | |_|/ / /
| | | |/| | | |
| | | | | | | |
| | | | | | | | |
* commit 'cb1a750214555ec1554bccfc7257b205e87459cb':
Add basic navigation controls to log viewer.
|
| | | | |\| | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* commit 'f59b994264b2e8ffe179e2405cda81811f8a9db1':
Add basic navigation controls to log viewer.
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Bug: 18642766
Change-Id: I95a6c8edf83513d421a041e79c15111b5c991dde
Signed-off-by: Patrick Tjin <pattjin@google.com>
|
| | | | | | |\ \ \
| | | | |_|/ / /
| | | |/| | | |
| | | | | | | |
| | | | | | | | |
* commit '8e8d5de4779e0f8f70cd39bf267026fff35f0a88':
Save kernel logs to /cache/recovery
|
| | | | |\| | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* commit 'cd055ee72a5efaf4bcbc0f81692410d3ffcda5e0':
Save kernel logs to /cache/recovery
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Bug: 18642766
Change-Id: I6c8b7d8f9ffb688d3afdfe0d47c4142e711e421d
Signed-off-by: Patrick Tjin <pattjin@google.com>
|
| | | | | | |\ \ \
| | | | |_|/ / /
| | | |/| | | |
| | | | | | | |
| | | | | | | | |
* commit '4f9fcffce7328b8f3f9a8384c51220f4a2cda8ba':
Force write to disk while doing uncrypt
|
| | | | |\| | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* commit '37ad1f1273dd579b84317be6d1a9a27ad32af88c':
Force write to disk while doing uncrypt
|
| | | | | |\ \ \ \ |
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
This should reduce errors if the device reboots before the blocks
are commited to disk.
Bug: 18481902
Change-Id: I13cda1c78955e4c83522fbcf87ddb16cc9f97683
|
| | | | | | | |\ \ \
| | | | |_|_|/ / /
| | | |/| | | | |
| | | | | | | | |
| | | | | | | | | |
* commit 'cdce7f7e552c036ec6fb406e9dabef615b11c1a9':
Fix recovery image build for 32p
|
| | | | |\ \ \ \ \ \
| |_|_|/ / / / / /
|/| | | | | | | |
| | | | | | | | |
| | | | | | | | | |
* commit 'c43b17f0adac1092e221ce6166ca8bc464090525':
Fix recovery image build for 32p
|
| |\ \ \ \ \ \ \ \ \
| |/ / / / / / / /
|/| | | | | | | | |
|
| |/ / / / / / / /
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
When building for 32p, we need to be explicit that we wish to build
the 32bit version of the binaries that will be placed in the recovery
image. The recovery image doesn't actually care... but if we are not
explicit in this, the makefiles will ask for the 64bit binaries but the
Android.mk for the binaries will supply the 32bit images (causing the
build to fail).
Change-Id: Iea2d5f412740c082795da4358765751138a4b167
|
| | | | | | |\ \ \
| | | |_|_|/ / /
| | |/| | | | |
| | | | | | | |
| | | | | | | | |
* commit '0fe938c0fbebfdd3f6dedb0761588a20e741c870':
Add support for tune2fs file operations
|
| | | |\| | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* commit '5b9c4ce5a15bb76919e1556ae59993e9c310c0bc':
Add support for tune2fs file operations
|
| | | | |\ \ \ \ \
| | | | |/ / / /
| | | |/| | / /
| | | | | |/ /
| | | | |/| | |
* commit 'b278c252e148798346f85fc92eeea6afeb33fbf0':
Add support for tune2fs file operations
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
This allows tune2fs to be executed from within OTA scripts,
allowing for file system modifications without formatting the
partition
Bug: 18430740
Change-Id: I0c2e05b5ef4a81ecea043e9b7b99b545d18fe5e6
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
This allows tune2fs to be executed from within OTA scripts,
allowing for file system modifications without formatting the
partition
Bug: 18430740
Change-Id: I0c2e05b5ef4a81ecea043e9b7b99b545d18fe5e6
|
| | | | | | |\ \
| | | |_|_|/ /
| | |/| | | |
| | | | | | |
| | | | | | | |
* commit '39be2f64fdcfe4aded40fa83a4b212bb8a5de1e3':
Global C++11 compatibility.
|
| | | |\ \ \ \ \
| |_|/ / / / /
|/| | | | | |
| | | | | | |
| | | | | | | |
* commit 'd34b63780eaf80ba71279360dc1e2fdbdc488eec':
Global C++11 compatibility.
|
| |\ \ \ \ \ \ \ |
|
| |/ / / / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Our build system compiles flex/bison as C++ rather than C, but a few
projects add `-x c` to their flags, forcing the compiler to compile
them as C. This causes the compiler to reject the global C++ standard
flag, so we need to explicitly provide a C standard flag to override
it.
Bug: 18466763
Change-Id: Id68ad9317261ed4d857a949b07288bd137ff6303
|
| | | | | | |\ \
| | | |_|_|/ /
| | |/| | | |
| | | | | | |
| | | | | | | |
* commit '71fa5392439bf7ec55bda58924d3180539f80972':
Byte swap to support BGRA in recovery mode
|
| | | |\| | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* commit 'de27d4cbb75a9c2f5ad0fc24edf5295d0f3d9fe0':
Byte swap to support BGRA in recovery mode
|
| | | | |\| | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* commit 'e5879c3639789d61803605c12371a4f291e0b3cc':
Byte swap to support BGRA in recovery mode
|
| | | | | | |/
| | | | |/|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Fixes color palate of recovery mode when double buffer enabled.
Bug: 18169447
Change-Id: Ia50b0fb9afd8001dfd740c09ce109fa421e691f7
|
| | | | | | |\
| | | |_|_|/
| | |/| | |
| | | | | |
| | | | | | |
* commit '82ca0ba805307f2c8bf4a3abb03fd7e1b5213ccb':
kill HAVE_FORKEXEC
|
| | | |\ \ \ \
| |_|/ / / /
|/| | | | |
| | | | | |
| | | | | | |
* commit '92242c704846f28932e555dba800f4a701063896':
kill HAVE_FORKEXEC
|
| |\ \ \ \ \ \
| |/ / / / /
|/| | | | | |
|
| |/ / / / /
| | | | |
| | | | |
| | | | |
| | | | | |
Bug: 18317407
Change-Id: Idd4e0effa96752e2c0ca959728f80df4d2d34187
|
| | | | | |\
| | |_|_|/
| |/| | |
| | | | |
| | | | | |
* commit '8bebe58e540b34078aecd155e7b58a7a02985483':
Use more aggressive sync writing to applypatch.
|
| | |\| | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '2020564f21bb0216965f0f5c43c5c1c995785bab':
Use more aggressive sync writing to applypatch.
|
| | | |\| |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit 'be81e51c171a0cf9b9b5045ee949282b7f36d779':
Use more aggressive sync writing to applypatch.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
We have seen cases where the boot partition is patched, but upon
recovery the partition appears to be corrupted. Open up all
patched files/partitions with O_SYNC, and do not ignore the
errors from fsync/close operations.
Bug: 18170529
Change-Id: I392ad0a321d937c4ad02eaeea9170be384a4744b
|
| | | | | |\
| | |_|_|/
| |/| | |
| | | | |
| | | | | |
* commit 'c2e7d903adca4195588be085011c2a6a9c80426a':
Force sync files written by minzip.
|
| | |\| | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit 'e908a45420fc4194c6007193d21d5b690e04583f':
Force sync files written by minzip.
|
| | | |\| |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '042c3cd04ec3ef416019fa382cd5b1a942bd79e1':
Force sync files written by minzip.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Some files appear to be missing their sync to disk.
Bug: 18145574
Change-Id: Ic858624a4dd65bbfc54d30f3a13c607078270345
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The patch "[RFC] usb: gadget: f_fs: Add flags
to descriptors block" marks the current
usb_functionfs_descs_head format deprecated
and introduces support for sending SuperSpeed
descriptors.
This CL makes adbd to send Descriptors in the
new format. Adbd would fall back to the old
format, if kernel is not able to recognize
the new format. This is done to prevent
adbd from breaking in the older versions
of the kernel.
Bug: 17394972
Change-Id: I1acf684ef8a4dcc612ac20b5abe1e27b43901031
Signed-off-by: Badhri Jagan Sridharan <badhri@google.com>
|
| | | | | |\
| | |_|_|/
| |/| | |
| | | | |
| | | | | |
* commit '8a9ee089d380bcbd2f4447770b944a552001fd28':
Log mount/unmount errors to UI
|
| | |\| | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit 'fe8563f4f2a6efe1eb00bb41a5037c88917becfc':
Log mount/unmount errors to UI
|
| | | |\| |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '5ddf4293df45a051c7900eeb62fb5ec4950b6cb6':
Log mount/unmount errors to UI
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Bug: 18092022
Change-Id: I6c42038ebeb1cfc1e7ca0d3e12310fdce1b990b0
|
| | | | | |\
| | |_|_|/
| |/| | |
| | | | |
| | | | | |
* commit '944fc5e616b6f70da3447fc6987fb2f92dfdc01f':
unconditionally apply SELinux labels to symlinks
|
| | |\| | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '915d661ccc64f25a533919054f487a8e5943574d':
unconditionally apply SELinux labels to symlinks
|
| | | |\| |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '688024169df70336cc128ea8cc929174c53a501e':
unconditionally apply SELinux labels to symlinks
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
At the end of the OTA script, we walk through /system, updating
all the permissions on the filesystem, including the UID, GID,
standard UNIX permissions, capabilities, and SELinux labels.
In the case of a symbolic link, however, we want to skip most of
those operations. The UID, GID, UNIX permissions, and capabilities
don't meaningfully apply to symbolic links.
However, that's not true with SELinux labels. The SELinux label on
a symbolic link is important. We need to make sure the label on the
symbolic link is always updated, even if none of the other attributes
are updated.
This change unconditionally updates the SELinux label on the symbolic
link itself. lsetfilecon() is used, so that the link itself is updated,
not what it's pointing to.
In addition, drop the ENOTSUP special case. SELinux has been a
requirement since Android 4.4. Running without filesystem extended
attributes is no longer supported, and we shouldn't even try to handle
non-SELinux updates anymore. (Note: this could be problematic if
these scripts are ever used to produce OTA images for 4.2 devices)
Bug: 18079773
Change-Id: I87f99a1c88fe02bb2914f1884cac23ce1b385f91
|
| | | | | |\
| | |_|_|/
| |/| | |
| | | | |
| | | | | |
* commit '45322f939a5bf66d378aab57e1fee1aa29ff9469':
Allow passing of mount args to mountFn
|
| | |\| | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit 'da500cecf5b004498c0dd17bc27a30eb4b0b9a2d':
Allow passing of mount args to mountFn
|
| | | |\| |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '168f77787700f0e9f66675beef33c593a777e64e':
Allow passing of mount args to mountFn
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Bug: 18079773
Bug: 18092222
Change-Id: Ifc3f3e123de729dfbb2f49414b3207afa96268d5
|
| | | | | |\
| | |_|_|/
| |/| | |
| | | | |
| | | | | |
* commit 'd1e909e77d6c20aa88630a86d7a93de54d5cf2af':
Log to UI any metadata setting errors
|
| | |\| | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '4da9cdeab97297e69075dd9b6cad9921cfae30b9':
Log to UI any metadata setting errors
|
| | | |\| |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '473967d87ff9fc7a541c16ebdc56364c285d2862':
Log to UI any metadata setting errors
|
| | | | |\ \ |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Bug: 18079773
Change-Id: Ic6fddbcbcb6ddb9e1cbd1698df98387c0033ae15
|
| | | | | | |\
| | |_|_|_|/
| |/| | | |
| | | | | |
| | | | | | |
* commit '3e62e9d93e97e39c260b62ac230002ae21ed4d96':
Make /cache/recovery/last_log available in recovery
|
| | |\| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* commit 'd0602fbb88c095520d0fc88e821eb5557298e32b':
Make /cache/recovery/last_log available in recovery
|
| | | |\| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* commit '9b2db80d407752fd524e799e4c7051162e63f91c':
Make /cache/recovery/last_log available in recovery
|
| | | | |\ \ \ |
|
| | | | | |/ /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Create a new recovery UI option to allow the user to view
/cache/recovery/last_log for their device. This gives enhanced
debugging information which may be necessary when a failed
OTA occurs.
Bug: 18094012
Change-Id: Ic3228de96e9bfc2a0141c7aab4ce392a38140cf3
|
| | | | | | |\
| | |_|_|_|/
| |/| | | |
| | | | | |
| | | | | | |
* commit 'c224ac28adf1248dcd5716a0c6ed77825418fe0d':
Treat already-renamed files as having no problems.
|
| | |\| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* commit '3b5c6dca0a448d1a09bf9adb905bc5a86230c7fc':
Treat already-renamed files as having no problems.
|
| | | |\| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* commit '2f0ef73029fc51c6404121f338b034c8b516652c':
Treat already-renamed files as having no problems.
|
| | | | |/ /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This should help with reentrant OTAs.
Bug: 18079773
Change-Id: I102fd738e3b450483ecd4471384c12e89fc586e2
|
| | | | | |\
| | |_|_|/
| |/| | |
| | | | | |
* commit '0745fbfad9cadafc0f911ec7c6d06d470839b85a':
|
| | |\ \ \ \
| |/ / / /
|/| | | |
| | | | | |
* commit 'c7249660f908c74687b5fdadc1296eb9d4903cc7':
|
| |\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* commit '4f66469b29a34811b69518a266be31fe42cc111b':
More test makefile cleanup.
|
| | | | | | |\
| | | |_|_|/
| | |/| | |
| | | | | | |
* commit '440185cdd383289fbf8afec353aa64fe0ed30773':
|
| | | |\ \ \ \
| |_|/ / / /
|/| | | | |
| | | | | | |
* commit 'ea5828a24f3a8f6a44e2f15e76cacdb5bc524db0':
|
| |\ \ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* commit '28ffde5ebd33d5b693906a93087e6eea627cd8d0':
Revert "Copy epoll(2) changes to minadb."
|
| | | | | | | |\
| | | | |_|_|/
| | | |/| | |
| | | | | | | |
* commit '3970568560f62c87d9ef7a1c0617c16b23271b6e':
|
| | | | |\ \ \ \
| |_|_|/ / / /
|/| | | | | |
| | | | | | | |
* commit 'e95ed95f05d22929e0bb8610a83c4e6a01fb3a33':
|
| |\ \ \ \ \ \ \
| | |_|_|_|/ /
| |/| | | | |
| | | | | | |
| | | | | | | |
* commit 'a6e13ae01bff5109361868f565187f16d045c82d':
Include reason when wiping data.
|
| | | | | | | |\
| | | | | |_|/
| | | | |/| |
| | | | | | | |
* commit 'e5ce559fb620ddea535b428d4cc21da701a5e4e7':
|
| | | | | |\ \ \
| |_|_|_|/ / /
|/| | | | | |
| | | | | | | |
* commit '78a30278607f0e57ace53eb5df7e5f7f196387a4':
|
| |\ \ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* commit '530b61e0b5f154e5f38853c10a28e0ea6f41c2ca':
Copy epoll(2) changes to minadb.
|
| | | | | | | | |\
| | | | | | |_|/
| | | | | |/| |
| | | | | | | |
| | | | | | | | |
* commit 'dd57886ce6ec100ce212b7d8d1f6991a4b77e004':
init.rc: Inidicate that booting is complete wrt firwmare requests
|
| | | | | | |\| |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* commit '9eb8c8bdbe4965e9a92d83882e97cf67aee20821':
init.rc: Inidicate that booting is complete wrt firwmare requests
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
ueventd will wait for /dev/.booting to go away before giving up
on loading firmware.
The issue was introduced in Ifdd5dd1e95d7e064dde5c80b70198882d949a710
which forgot to update recovery's init.rc
Bug: 17993625
Change-Id: I91205fe6eea50aaef9b401d650ec8d6843a92a57
|
| | | | | | | | |\
| | | | | | |_|/
| | | | | |/| |
| | | | | | | |
| | | | | | | | |
* commit '5b7f5b15af016299e10d18979ec65720ab447786':
More test makefile cleanup.
|
| | | | | | |\ \ \
| | | | | |/ / /
| | | | |/| | |
| | | | | | | |
| | | | | | | | |
* commit '4f66469b29a34811b69518a266be31fe42cc111b':
More test makefile cleanup.
|
| | | | |/| | | | |
|
| | | | |/ / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Global variables kill.
No need to manually link gtest, and that causes problems with
libc++.
Change-Id: If804cdd436cf1addfa9a777708efbc37c27770b6
|
| | | | | | | |\
| | | | | |_|/
| | | | |/| |
| | | | | | |
| | | | | | | |
* commit '93ecb9383a22c6828c9b332b7d1089ff97319999':
Revert "Copy epoll(2) changes to minadb."
|
| | | | | |\ \ \
| | | | |/ / /
| | | |/| | |
| | | | | | |
| | | | | | | |
* commit '28ffde5ebd33d5b693906a93087e6eea627cd8d0':
Revert "Copy epoll(2) changes to minadb."
|
| | | |/| | | |
| |/| | | | | |
|
| | | |/ / / /
| |/| | | |
| | | | | |
| | | | | | |
This reverts commit db8c959049d21fe63e48c270f1fc12b32a0cf0ec.
|
| | | | | | |\
| | | | |_|/
| | | |/| |
| | | | | |
| | | | | | |
* commit '91c27888517c514d1da8cbcd76fdc4b437d193f8':
support for version 2 of block image diffs
|
| | | | |\| |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* commit 'd83e4f15890ac6ebe0d61924bd224eb1ae8565ad':
support for version 2 of block image diffs
|
| | | | |/ /
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
In version 2 of block image diffs, we support a new command to load
data from the image and store it in the "stash table" and then
subsequently use entries in the stash table to fill in missing bits of
source data we're not allowed to read when doing move/bsdiff/imgdiff
commands.
This leads to smaller update packages because we can break cycles in
the ordering of how pieces are updated by storing data away and using
it later, rather than not using the data as input to the patch system
at all. This comes at the cost of the RAM or scratch disk needed to
store the data.
The implementation is backwards compatible; it can still handle the
existing version 1 of the transfer file format.
Change-Id: I4559bfd76d5403859637aeac832f3a5e9e13b63a
|
| | | | | |\
| | | | |/
| | | |/|
| | | | |
| | | | | |
* commit '6265665282a913a545606f4e8a20de8c57c3ae84':
Include reason when wiping data.
|
| | | | |\ \
| | | |/ /
| | |/| |
| | | | |
| | | | | |
* commit 'a6e13ae01bff5109361868f565187f16d045c82d':
Include reason when wiping data.
|
| | |/ / /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This will help us track down who requested a data wipe.
Bug: 17412160
Change-Id: I1c439fbd29f96b9851810baca9101f683a0f18d8
|
| | | | |\
| | | |/
| | |/|
| | | |
| | | | |
* commit '970c3947f39e8c880dd9f32002f9c7a9cdc96d54':
Copy epoll(2) changes to minadb.
|
| | |/| |
|/|/ /
| | |
| | |
| | | |
* commit '530b61e0b5f154e5f38853c10a28e0ea6f41c2ca':
Copy epoll(2) changes to minadb.
|
| | |\ \ |
|
| | |/ /
| | |
| | |
| | |
| | | |
Bug: 17588403
Change-Id: Ib3525824ff09330bd9d6f9e96d662e5a55a20ec2
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Kernel 2.6.16 is the first stable kernel with struct fuse_init_out
defined (fuse version 7.6). The structure is the same from 7.6 through
7.22. Beginning with 7.23, the structure increased in size and added
new parameters.
If the kernel only works on minor revs older than or equal to 22,
then use the older structure size since this code only uses the 7.22
version of the structure.
Change-Id: I00d7530e01e6b4718dcd04ad2484959d12ef4a65
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
In version 2 of block image diffs, we support a new command to load
data from the image and store it in the "stash table" and then
subsequently use entries in the stash table to fill in missing bits of
source data we're not allowed to read when doing move/bsdiff/imgdiff
commands.
This leads to smaller update packages because we can break cycles in
the ordering of how pieces are updated by storing data away and using
it later, rather than not using the data as input to the patch system
at all. This comes at the cost of the RAM or scratch disk needed to
store the data.
The implementation is backwards compatible; it can still handle the
existing version 1 of the transfer file format.
Change-Id: I7fafe741d86b92d82d46feb2939ecf5a3890dc64
|
| | | |\
| |_|/
|/| |
| | |
| | | |
* commit '574443d8956802f35347cac7fae7eb16240e3c16':
create block map for all update packages on /data
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Always create the block map for packages on /data; don't only look at
the encryptable/encrypted flags.
Bug: 17395453
Change-Id: Iaa7643a32898328277841e324305b9419a9e071c
|
| | | |\
| |_|/
|/| |
| | |
| | | |
* commit '40482ea2ae5ca8cbcf46125f601c0bc766f99943':
fix comment in blockimg updater code
|
| |\ \ \ |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The comment for the DEBUG_ERASE setting is exactly backwards.
Change-Id: I98ab5828365894217fc78976817a131e7d22d5c1
|
| | | | |\
| |_|_|/
|/| | |
| | | |
| | | | |
* commit '8328922ff040280007da0aaaf8b567581231d5ed':
use lseek64 instead of lseek
|
| |/ / /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Otherwise, overflow problems can occur with images larger than
2G since the offsets will overflow a 32-bit off_t.
Change-Id: I05951a38ebeae83ad2cb938594e8d8adb323e2aa
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
|
| | | |\
| |_|/
|/| |
| | |
| | | |
* commit '5f875bf57739bf0b5c2d182173513233bdb71ab8':
remove code for original block OTA mechanism
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
Superseded by newer code.
Bug: 16984795
Change-Id: I842299f6a02af7ccf51ef2ca174d813ca53deef1
|
| | | |\ |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Superseded by newer code.
Bug: 16984795
Change-Id: I70c1d29dc03287b06ea909d17f729ec51ccb0344
|
| | | |\ \
| |_|/ /
|/| | /
| | |/
| | | |
* commit 'f449db2f30235a0c2fef4bc7bc41776e271a60a0':
open misc device in write-only mode
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Opening the misc block device in read-write mode runs afoul of
SELinux, which keeps the wipe code from working. Fix. Also change
various things to log to logcat so we can see them happening, for
future debugging.
Bug: 16715412
Change-Id: Ia14066f0a371cd605fcb544547b58a41acca70b9
|
| | | |\
| |_|/
|/| |
| | |
| | | |
* commit '1d5d6098f4a470bc8e56ae8914180041815e6e22':
fix two bugs in block image updater
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The computation of file offsets was overflowing for partitions larger
than 2 GB. The parsing of the transfer file could fail at the end if
the data happened to not be properly null-terminated.
Bug: 16984795
Change-Id: I3ce6eb3e54ab7b55aa9bbed252da5a7eacd3317a
|
| | | |\
| |_|/
|/| |
| | |
| | | |
* commit 'bc7ffeda98a861e346c30c771d3258030f7fcf21':
installer for new block OTA system
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
(Cherry-pick back from master.)
Bug: 16984795
Change-Id: Ifa3d8345c5e2a0be86fb28faa080ca82592a96b4
|
| | | |\ |
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Bug: 16984795
Change-Id: I90f958446baed83dec658de2430c8fc5e9c3047e
|
| | | |\ \
| |_|/ /
|/| | /
| | |/
| | | |
* commit '2efc9d994ce59f9ebfc2290c2adc5d760e8939c2':
clear BCB in misc partition before rebooting
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Something is leaving behind wipe commands in the BCB area of the /misc
partition. We don't know what is doing that. It should always be
safe to zero out that area from uncrypt, though (because if uncrypt is
running then it's got the command we want in the recovery command file
rather than the BCB).
Bug: 16715412
Change-Id: Iad01124287f13b80ff71d6371db6371f43c43211
|
| | | |\
| |_|/
|/| |
| | |
| | | |
* commit '1a35a586904cd429fd3a6a6c2de64a16ccdf693d':
revert uncrypt back to dynamic linking, fix libs
|
| | | |
| | |
| | |
| | |
| | | |
Bug: 17029174, 17015157
Change-Id: I1d24f3402875dfb972daa6daef0f385baeff84e9
|
| | | |\
| |_|/
|/| |
| | |
| | | |
* commit '537d34f907a5e984ccad1c88825adc8ae9814834':
change uncrypt to static linking
|
| | | |
| | |
| | |
| | |
| | | |
Bug: 17015157
Change-Id: I3c4bdcf4f11d44b617bb731a48413e3707044d1c
|
| | | |\
| |_|/
|/| |
| | |
| | | |
* commit '9dc71cfa5233789a50d8a9d2c9af87d0f106d4ad':
Erase PST partition if its marked to be erased.
|
| |\ \ \ |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
We need to wipe the challenges on this partition
if OEM unlock is enabled, as this is a signal that
the user has opted out of factory reset protection.
go/factory-reset
Bug: 16633064
Change-Id: Icb8f1433bf99ca57813f5b72d5a3dd15fa94a263
|
| | | | |\
| |_|_|/
|/| | |
| | | |
| | | | |
* commit '2b5f0e0f767ce51d9605809052ad04fe83d1df83':
remove spurious parens from error message
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
These error messages include empty parens after each string
substition. Ill-advised cut and paste, probably.
Bug: 16467401
Change-Id: Ib623172d6228354afdcc2e33442cc53a07f0ecbc
|
| | | | |\
| |_|_|/
|/| | |
| | | |
| | | | |
* commit '78d458c3d279a24a60fda013026b7a5454d01a9b':
Fix length printing + formats
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Fix wrong argument order.
Fix for 32 vs 64 bit.
(reported by htc)
Change-Id: Ie37a280bed2848199bcc075500e1326e371cd326
|
| | | | |\
| |_|_|/
|/| | |
| | | |
| | | | |
* commit 'eaf33654c1817bd665831a13c5bd0c04daabee02':
only do uncryption on packages in /data
|
| |/ / /
| | |
| | |
| | |
| | |
| | |
| | | |
If recovery is invoked with a package somewhere other than /data,
leave it alone.
Change-Id: Ief358b53df467ae24a65e30e7a631da59bf13683
|
| | | |\
| |_|/
|/| |
| | |
| | | |
* commit 'a91ecc59b2753a3dcc93b2619559a980074e77bd':
Auto create parent directories for rename support
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Sometimes renames will move a file into a directory
that does not yet exist. This will create the
parent directories, using the same symlink logic,
to ensure that there is a valid destination.
Change-Id: Iaa005a12ce800c39f4db20f7c25a2a68cb40a52d
|
| | |/
|/|
| |
| |
| |
| |
| |
| |
| |
| | |
Sometimes renames will move a file into a directory
that does not yet exist. This will create the
parent directories, using the same symlink logic,
to ensure that there is a valid destination.
Bug: 16458395
Change-Id: Iaa005a12ce800c39f4db20f7c25a2a68cb40a52d
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
Make a fuse filesystem that sits on top of the selected package file
on the sdcard, so we can verify that the file contents don't change
while being read and avoid copying the file to /tmp (that is, RAM)
before verifying and installing it.
Change-Id: Ifd982aa68bfe469eda5f839042648654bf7386a1
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
Split the adb-specific portions (fetching a block from the adb host
and closing the connections) out from the rest of the FUSE filesystem
code, so that we can reuse the fuse stuff for installing off sdcards
as well.
Change-Id: I0ba385fd35999c5f5cad27842bc82024a264dd14
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
Drop support for sideloading OTA packages of the cache partition (a
half-solution that's long since been deprecated by "adb sideload").
Refactor the code to sideload OTA packages from SD cards: remove the
installation code from the file browser.
Change-Id: Id0dff6b27c4a5837546f174f50e2e1d0379c43db
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Implement a new method of sideloading over ADB that does not require
the entire package to be held in RAM (useful for low-RAM devices and
devices using block OTA where we'd rather have more RAM available for
binary patching).
We communicate with the host using a new adb service called
"sideload-host", which makes the host act as a server, sending us
different parts of the package file on request.
We create a FUSE filesystem that creates a virtual file
"/sideload/package.zip" that is backed by the ADB connection -- users
see a normal file, but when they read from the file we're actually
fetching the data from the adb host. This file is then passed to the
verification and installation systems like any other.
To prevent a malicious adb host implementation from serving different
data to the verification and installation phases of sideloading, the
FUSE filesystem verifies that the contents of the file don't change
between reads -- every time we fetch a block from the host we compare
its hash to the previous hash for that block (if it was read before)
and cause the read to fail if it changes.
One necessary change is that the minadbd started by recovery in
sideload mode no longer drops its root privileges (they're needed to
mount the FUSE filesystem). We rely on SELinux enforcement to
restrict the set of things that can be accessed.
Change-Id: Ida7dbd3b04c1d4e27a2779d88c1da0c7c81fb114
|
| |\ \
| | |
| | |
| | |
| | | |
* commit '3e0fc39ec27c0ed96ffd2a617f1841fe3bf3c8f6':
Fix recovery mode.
|
| | |\|
| | |
| | |
| | |
| | | |
* commit '974fe112ae6df95ca6d49688d6e3e459d87e16de':
Fix recovery mode.
|
| | | |\ |
|
| | | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Duplicate changes made to init.rc for https://android-review.googlesource.com/98852
in the init.rc used for recovery mode.
Bug 15849856
Change-Id: Ia376ddf6373a28718653f7fb1435bf7ecb33d813
|
| | | |
| | |
| | |
| | |
| | |
| | | |
Set panic_on_oops=1 to reboot if the kernel panics.
Change-Id: Id9e8689a570229db2ea2a3d72b52784f8a1ed107
|
| | | |
| | |
| | |
| | |
| | |
| | | |
Instead of LOCAL_ADDITIONAL_DEPENDENCIES.
Bug: 15702524
Change-Id: Ic152ae60354bf09eccdb9a85dcd04f0f076a6422
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This adds F2FS support
- for wiping a device
- for the install "format" command.
Note: crypto data in "footer" with a default/negative length
is not supported, unlike with "ext4".
Change-Id: I8d141a0d4d14df9fe84d3b131484e9696fcd8870
Signed-off-by: JP Abgrall <jpa@google.com>
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
Clear framebuffer at init.
[toddpoynor@google.com: forward port]
Change-Id: Ie98c7724cd974dcacef3e3559a6fe492864a5e72
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
While executing syspatch and package_extract_file() calls with don't
care maps (both of which are used to rewrite the system image in
incremental and full block OTAs, respectively), pass a progress
callback in and use it to update the visible progress bar.
Change-Id: I1d3742d167c1bb2130571eb5103b7795c65ff371
|
| |\ \ \
| | | |
| | | |
| | | |
| | | | |
* commit 'dff8afe1b21c6ffe09269434f9f8f0d166e1a848':
restore holo UI in recovery -- DO NOT MERGE
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Since we don't have quantum assets for recovery yet, go back to the
holo appearance (dark background, blue glowing progress bar) for
lmp-preview.
Change-Id: Id4d3f23e0a6251a12aa42f3793cff347f38b4243
|
| |\ \ \ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Return to the recovery to the holo appearance.
Bug: 15424396
Change-Id: Id4d3f23e0a6251a12aa42f3793cff347f38b4243
|
| |\ \ \ \ \
| |/ / / /
|/| | / /
| | |/ /
| |/| | |
* commit '54a6117935fe7470d23f7a538aeec9d6b139791b':
recovery: initialize keys press tracking status
|
| | |\ \ \
| | | |/
| | |/|
| | | |
| | | | |
* commit 'cfd4b2864534f062a01730d81b2cd7e054087e8f':
recovery: initialize keys press tracking status
|
| | | |\ \ |
|
| | | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Checks for keys pressed return random results because of an uninitialized data
structure.
Change-Id: Ic8b3d453d62347921aa893403079b374c16a092e
Signed-off-by: Mihai Serban <mihai.serban@intel.com>
|
| | |_|/
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The default recovery UI will reboot the device when the power key is
pressed 7 times in a row, regardless of what recovery is doing.
Disable this feature during package installation, to minimize the
chance of corrupting the device due to a mid-install reboot. (Debug
packages can explicitly request that the feature be reenabled.)
Change-Id: I20f3ec240ecd344615d452005ff26d8dd7775acf
|
| |\| |
| | |
| | |
| | |
| | | |
* commit '502e45957420484eec2367e7580e9bec96605c5d':
exit instead of return if sideload file creation fails
|
| | |\|
| | |
| | |
| | |
| | | |
* commit 'd1c64060abf8a56a259c0913244448fdba245f6c':
exit instead of return if sideload file creation fails
|
| | | |\
| | | |
| | | |
| | | |
| | | | |
* commit '5fbb729f3eb67c9bb59580f692a31e5c50e24e6d':
exit instead of return if sideload file creation fails
|
| | | | |\ |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
A return here leaves adb sideload in a permanent loop. An exit is
more appropriate for this error.
Change-Id: I80fb8abae4f6378833aa75f9eaf7ec1acd44b274
Signed-off-by: Ethan Yonker <ethanayonker@gmail.com>
|
| |\| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit 'c4804e9b9c143652d17441b4b672b920b11cc94a':
fix vulnerability in bspatch
|
| | |\| | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit 'd4592694b41d5f8309d98cd3312b5486216cc685':
fix vulnerability in bspatch
|
| | | |\| |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '3ca99f6cb8ffbe19c7ef5409f3dac18ea0c254bd':
fix vulnerability in bspatch
|
| | | | |\ \ |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Patches with control data tuples with negative numbers in the first
and/or second can cause bspatch to write to arbitrary locations in the
heap.
Change-Id: I8c5d81948be773e6483241131d3d166b6da27cb8
|
| |\| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* commit '0766cdf49acb77677864995e931eec391243505d':
Support BGRA framebuffer
|
| | |\| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* commit 'd2fb4ed58997afd18bd2b5274bf1835644d454fb':
Support BGRA framebuffer
|
| | | |\| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* commit 'd27aa76a6ff6436cfb8340bf3d04aba186cc4de1':
Support BGRA framebuffer
|
| | | | |\ \ \ |
|
| | | | |/ / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The re-designed recovery graphics code only supports RGB{_,X,A}
framebuffer, and this patch adds support for BGRA framebuffer.
Change-Id: I3780c8288088f497fa248f3492c54f43834a8598
Signed-off-by: Daniel Leung <daniel.leung@intel.com>
Reviewed-by: Jovanovic, Radivoje <radivoje.jovanovic@intel.com>
Reviewed-by: Parkinson, TimothyX L <timothyx.l.parkinson@intel.com>
Tested-by: Parkinson, TimothyX L <timothyx.l.parkinson@intel.com>
Reviewed-by: Boie, Andrew P <andrew.p.boie@intel.com>
Reviewed-by: Gumbel, Matthew K <matthew.k.gumbel@intel.com>
|
| |\| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* commit '48abd574cb1b7b0adbe1de36224fb974182aaa2d':
screen_ui: Initialize text buffer
|
| | |\| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* commit '34ff5fe3f59abfb1984189ade32059cc47bf97e5':
screen_ui: Initialize text buffer
|
| | | |\| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* commit '74b90b309f67dc3b8bb74e47c4eddf7ce511bc35':
screen_ui: Initialize text buffer
|
| | | | |\ \ \
| | | | |/ /
| | | |/| | |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Zero initialize the text buffer to make recovery not
render garbage when showing the menu or messages.
Change-Id: I0dd0d357757f6b0fd52ad3b3617d42bb1b835245
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Currently, the writeProcessFunction fails when
there are zero bytes to write, potentially returning
errno from a previous operation, or hanging
indefinitely while it waits for a >0 result on a
write of size 0. This happens when the output
file is intended to be zero bytes in size.
Change-Id: Ib3cfcaf66d82942bc89e5f5c64697862403b38da
|
| |\| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* commit 'e9f9238af83f949dc000667356eba025e1241a2f':
recovery: minui: add adf backend
|
| | |\| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* commit '1cd5242349bb1ef10eca76ff2c3e17415aecdf9d':
recovery: minui: add adf backend
|
| | | |\| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* commit '1c2cf1db0db2c9e9310d27bdc19c605f5537b72f':
recovery: minui: add adf backend
|
| | | | |\ \ \ |
|
| | | | |/ / /
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Change-Id: I1ad97b5b62bddbcb1104fa0b4e54415b793a4194
Signed-off-by: Greg Hackmann <ghackmann@google.com>
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The new build.prop for Sprout includes lines of the format:
import xxx.prop
These can be safely ignored when reading the property file.
Change-Id: Ia84a138e71461ffe8e591e88143b9787873def29
|
| |\| | | | |
| | | | | |
| | | | | |
| | | | | | |
* commit 'ddaaccb3db623ff6f19b7dadf51d41cc46bb05c3':
|
| | |\| | | |
| | | | | |
| | | | | |
| | | | | | |
* commit '29759e9d518880adba366c502cf79d53c48a31bb':
|
| | | |\ \ \ \
| | | |/ / /
| | |/| | | |
|
| | | | |\ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* commit 'aa4545b5aedae165c8d2db0009dcdfa18e4f7923':
restore minui support for paletted images with < 8 bits
|
| | | | |\ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Change-Id: Ib1d15be84cec58e23472ef2014d322f3f55c6bb8
|
| | | | |\ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
* commit '130a7985386f7f7741179fc38b1a15da7ec9f358':
fix error log statement
|
| | | | |\ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Change-Id: I19f9f460145fdcf5cdc58ee4fa25ff3c9ba398f0
|
| | | | |\ \ \ \ \ \ \
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
* commit '026ebe0214d6c1c9b3ddc22c35e9ac37e5f622bc':
Recovery 64-bit compile issues
|
| | | | |\ \ \ \ \ \ \ \
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
* commit 'a7266ef0b1804e3ddeea58bda9a416e807a55f88':
separate fbdev-specific code out from minui
|
| | | | |\ \ \ \ \ \ \ \ \
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
* commit 'c91612d4668688c5d7bf76c258c11010697a03d2':
remove pixelflinger from recovery
|
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
* commit '8f087d024619467de8609656e8a14370f24b817c':
update tools for making recovery images
|
| | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
* commit '5950899369b712f66aa56c857c66ed1b6741f0e0':
allow CheckKey to request mounting /system
|
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
Conflicts:
screen_ui.cpp
screen_ui.h
Change-Id: Iefe7dde04cc76639f56730a19238436073f18ffb
|
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
* commit '2f173bde6584f4c560ecc3f13f6e890f52815050':
ADB sideload command not work
|
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
* commit 'ac189bf645123b4dc79cd2053f5eb07917774d66':
recovery: Fix adb with linux 3.10
|
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
* commit 'a5d105e2397d81537facd93fd8a9d3e263d57dc9':
recovery: fix building with pointer-to-int errors turned on
|
| |\| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
* commit '9e8d81ba96b299cc084723797d9f492d4441d57a':
recovery: Fix adb with linux 3.10
|
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | |
* commit '0e22af658c89fb53ab1215a3538bbaf10d733ad9':
recovery: Fix adb with linux 3.10
|
| | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | |
In kernel 3.10, f_adb has been removed and adbd can use functionfs
instead. Mount functionfs on boot for adbd. On older kernels, mount
will fail silently and adbd will revert to f_adb.
Bug: 14160609
Change-Id: I5db57aaf35b35859ea88c7d0e0661d8c553e5811
|
| |\| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | |
* commit 'ecf1f6c9299c0cae2f2bf1647f5d7d3a2690f819':
Change filesystem add entry API call.
|
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | |
* commit '558f2700e18d50cf8e798254200ef37f7a09678d':
Change filesystem add entry API call.
|
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / /
| | |/| | | | | | | | | | | | | | | | | |
|
| | | |/ / / / / / / / / / / / / / / / /
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
Needs fs_mgr matching change from: Icf23e659265d71d5226d527c2b40cfbc132320ee
Change-Id: I9adb470b04e4301989d128c9c3097b21b4dea431
Signed-off-by: Sasha Levitskiy <sanek@google.com>
|
| | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
Provide different recovery UI resources for different display
densities. Right now only the text images and the progress bars are
rescaled; the main icon will get scaled when it's updated for QP.
Lightly quantum-ify the rest of the recovery interface. (Light
background, progress bars, etc.)
Change-Id: Ia639c4ce8534b01bc843524efbc4b040c1cf38b3
|
| | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
Useful when debugging or developing for recovery.
Change-Id: Ic3ab42d5e848ad3488f1c575339b55e45c8a024b
|
| | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
RecoveryUI (which is the superclass of ScreenRecoveryUI), provides a
basic CheckKey method that is useful for devices that have KEY_POWER,
KEY_VOLUMEUP, and KEY_VOLUMEDOWN. Stop overriding it with a less
featureful method; with this no recovery UI customization is needed
for most handheld devices (phones, tablets, etc.).
Change-Id: I7d57cfaaef79afea8af4fc3dbc570afc61aeb5bc
|
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | |
cryptfs.h now includes sha header from libcrypto folder
Change-Id: Icd02c88971aedf96040c3bd9ca759e531546023b
|
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | |
* commit '03008bc1e89a780e382abe0567e709daecce92ff':
restore minui support for paletted images with < 8 bits
|
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | |
* commit 'aa4545b5aedae165c8d2db0009dcdfa18e4f7923':
restore minui support for paletted images with < 8 bits
|
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / /
| | |/| | | | | | | | | | | | | | | | | |
|
| | | |/ / / / / / / / / / / / / / / / /
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
The PNG image loaders should support images that use palettes
requiring fewer than 8 bits.
Change-Id: Ibcb0ff6f04aea8de54b03c0efa7a79e9b3635146
|
| | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
Change-Id: Ie88c49dea13cce5f4eb428e97f5a0956f2656a30
|
| |\| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
* commit '0300247758cf1965867128c79d94e0b2c38a69aa':
add --shutdown_after option to recovery
|
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | |
* commit 'bacf9b4558c69e918d9c05b6f111bbb223829829':
add --shutdown_after option to recovery
|
| | | | |_|/ / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
The "--shutdown_after" option causes recovery to power down the device
on completion rather than rebooting.
Removes the last vestiges of the "--previous_runs" argument, which
doesn't seem to be used for anything.
Change-Id: I465eda2ef59d367e2b1c79a8dc69831263c69a4d
Conflicts:
recovery.cpp
|
| |\| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
* commit 'b4bbf8878c3a6b2a17a3a96f1a23300748dbd81a':
add --shutdown_after option to recovery
|
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | |
Change-Id: I3d00437d519f93652ccae6b361e89e853ccae9b3
|
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / /
| | |/| | | | | | | | | | | | | | | |
|
| | | |/ / / / / / / / / / / / / / /
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
The "--shutdown_after" option causes recovery to power down the device
on completion rather than rebooting.
Removes the last vestiges of the "--previous_runs" argument, which
doesn't seem to be used for anything.
Change-Id: I465eda2ef59d367e2b1c79a8dc69831263c69a4d
|
| |\| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
* commit '47c7e365071f75489604b2d0ba3109fe39bac1ef':
fix error log statement
|
| | |\| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
* commit '130a7985386f7f7741179fc38b1a15da7ec9f358':
fix error log statement
|
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|_|_|_|_|_|/ / /
| | |/| | | | | | | | | | | | | | |
|
| | | |/ / / / / / / / / / / / / /
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
We were printing the address of channels instead of the value there.
Change-Id: I652340c7c1a0abaf01af555e54d2c0366d21ad78
|
| |\| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
* commit '80c1a386d3f614919708b37986919ecaf74ee738':
refactor image resource loading code in minui
|
| | |\| | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
Change-Id: Ib95b5bcd8d24014e1f2a956d2f31c99a471d3e30
|
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|_|_|_|_|/ / /
| | |/| | | | | | | | | | | | | |
|
| | | |/ / / / / / / / / / / / /
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
Reduce the number of copies of libpng boilerplate. Rename
res_create_* functions to be more clear. Make explicit the use of the
framebuffer pixel format for images, and handle more combinations of
input and output (eg, loading a grayscale image for display rather
than use as a text alpha channel).
Change-Id: I3d41c800a8f4c22b2f0167967ce6ee4d6b2b8846
|
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
Regression - verification and extraction on memory, not files
Bug: 12188746
Change-Id: Ib6facc4aff6be3a31a7d184ef1c493fdd4012c21
|
| |\| | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
* commit '4b6de1ba1ce0fff95c18a8abb7ba6e5762006d49':
Recovery 64-bit compile issues
|
| | |\| | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
* commit '026ebe0214d6c1c9b3ddc22c35e9ac37e5f622bc':
Recovery 64-bit compile issues
|
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|_|_|_|/ / /
| | |/| | | | | | | | | | | | |
|
| | | |/ / / / / / / / / / / /
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
Change-Id: I92d5abd1a628feab3b0246924fab7f97ba3b9d34
|
| |\| | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
* commit '239fb930e4d91de5d3a66997d32d43414055d40e':
separate fbdev-specific code out from minui
|
| | |\| | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
* commit 'a7266ef0b1804e3ddeea58bda9a416e807a55f88':
separate fbdev-specific code out from minui
|
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|_|_|/ / /
| | |/| | | | | | | | | | | |
|
| | | |/ / / / / / / / / / /
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
Isolate the code that interacts with fbdev, in preparation for adding
a new backend.
Change-Id: I19105e9da1ca6408cebc110f7e2bb5abfb481ee9
|
| |\| | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
* commit 'cb1bdc9e427b8b7262d1e56fef47d2bb6d76139f':
remove pixelflinger from recovery
|
| | |\| | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
* commit 'c91612d4668688c5d7bf76c258c11010697a03d2':
remove pixelflinger from recovery
|
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|_|/ / /
| | |/| | | | | | | | | | |
|
| | | |/ / / / / / / / / /
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
Recovery now draws directly to the framebuffer by rolling its own
graphics code, rather than depending on libpixelflinger.
The recovery UI is modified slightly to eliminate operations that are
slow with the software implementation: when the text display / menu is
turned on, it now appears on a black background instead of a dimmed
version of the recovery icon.
There's probably substantial room for optimization of the graphics
operations.
Bug: 12131110
Change-Id: Iab6520e0a7aaec39e2ce39377c10aef82ae0c595
Conflicts:
minui/resources.c
|
| |\| | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
* commit '7003ff3b54e9081dba92ecfea0594355af40e6dd':
update tools for making recovery images
|
| | |\| | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
* commit '8f087d024619467de8609656e8a14370f24b817c':
update tools for making recovery images
|
| | | |\ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|/ / /
| | |/| | | | | | | | | |
|
| | | |/ / / / / / / / /
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
We no longer render animations as a base image with a
possibly-partially-transparent overlay drawn over it, so delete the
make-overlay.py tool. Now we represent them as series of images that
are interlaced by row (with a special text chunk in the PNG file
specifying the number of frames) so add the interlace-frames.py tool
to make those.
Change-Id: I866db269107a21351c3df3b4683f233f72234334
|
| |\| | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
* commit 'aa6b8026ed5ae32f10b948edd26e3f489ba20751':
allow CheckKey to request mounting /system
|
| | |\| | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
* commit '5950899369b712f66aa56c857c66ed1b6741f0e0':
allow CheckKey to request mounting /system
|
| | | |\ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|/ / /
| | |/| | | | | | | | |
|
| | | |/ / / / / / / /
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Also provide a default implementation of CheckKey that's reasonable
for many devices (those that have power and volume keys).
Change-Id: Icf6c7746ebd866152d402059dbd27fd16bd51ff8
|
| |\| | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
* commit 'c15b7865badc3ac406a7ce978baa65151a50bb55':
change how recovery animation is implemented
|
| | |\| | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Change-Id: I8cc3b8101bccf7fd697f9a7b73732d1000dc27a1
|
| | | |\ \ \ \ \ \ \ \
| | | |_|_|_|_|/ / /
| | |/| | | | | | | |
|
| | | |/ / / / / / /
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Instead of one 'base' installing image and a number of overlay images
that are drawn on top of it, we represent the installing animation
with one PNG that contains all the animation frames, interlaced by
row. The PNG is expected to have a text chunk with the keyword
'Frames' and a value that's the number of frames (as an ascii
string). This representation provides better compression, removes the
need to subclass ScreenRecoveryUI just to change the position of the
overlay or number of frames, and doesn't require gr_blit() to support
an alpha channel.
We also remove the 'indeterminate' progress bar used when wiping data
and/or cache. The main animation serves the same purpose (showing
that the device is still alive); the spinning progress bar has been
redundant for a while.
This changes the default recovery animation to include the
antenna-wiggling and gear-turning that's used in the Nexus 5 recovery
animation.
Change-Id: I51930a76035ac09969a25472f4e572b289418729
Conflicts:
screen_ui.cpp
screen_ui.h
|
| |\ \ \ \ \ \ \ \ \ |
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Isolate the code that interacts with fbdev, in preparation for adding
a new backend.
Change-Id: I19105e9da1ca6408cebc110f7e2bb5abfb481ee9
|
| |/ / / / / / / / /
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
We no longer render animations as a base image with a
possibly-partially-transparent overlay drawn over it, so delete the
make-overlay.py tool. Now we represent them as series of images that
are interlaced by row (with a special text chunk in the PNG file
specifying the number of frames) so add the interlace-frames.py tool
to make those.
Change-Id: I79443f125f9c7d8d61cd09e3434745e0ef38893f
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Recovery now draws directly to the framebuffer by rolling its own
graphics code, rather than depending on libpixelflinger.
The recovery UI is modified slightly to eliminate operations that are
slow with the software implementation: when the text display / menu is
turned on, it now appears on a black background instead of a dimmed
version of the recovery icon.
There's probably substantial room for optimization of the graphics
operations.
Bug: 12131110
Change-Id: Iab6520e0a7aaec39e2ce39377c10aef82ae0c595
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Instead of one 'base' installing image and a number of overlay images
that are drawn on top of it, we represent the installing animation
with one PNG that contains all the animation frames, interlaced by
row. The PNG is expected to have a text chunk with the keyword
'Frames' and a value that's the number of frames (as an ascii
string). This representation provides better compression, removes the
need to subclass ScreenRecoveryUI just to change the position of the
overlay or number of frames, and doesn't require gr_blit() to support
an alpha channel.
We also remove the 'indeterminate' progress bar used when wiping data
and/or cache. The main animation serves the same purpose (showing
that the device is still alive); the spinning progress bar has been
redundant for a while.
This changes the default recovery animation to include the
antenna-wiggling and gear-turning that's used in the Nexus 5 recovery
animation.
Change-Id: I51930a76035ac09969a25472f4e572b289418729
|
| |\ \ \ \ \ \ \ \ \
| |_|_|_|/ / / / /
|/| | | | | | | | |
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Make package_extract_file() take an optional third argument which is
the pathname (in the package zip) of a map of don't-care regions to
skip over when writing the file.
Modify syspatch() to take source and target don't-care maps and use
them when patching the system partition.
Add the wipe_block_device() function to do a discard of all data on
the partition.
Change-Id: I8c856054edfb6aab2f3e5177f16d9d78add20be4
|
| |\ \ \ \ \ \ \ \ \
| | |/ / / / / / /
| |/| | | | | | |
| | | | | | | | |
| | | | | | | | | |
* commit '49968f0903eb69b1505bc99926344aacee4e81b6':
ADB sideload command not work
|
| | |\ \ \ \ \ \ \ \
| | | |/ / / / / /
| | |/| | | | | |
| | | | | | | | |
| | | | | | | | | |
* commit '2f173bde6584f4c560ecc3f13f6e890f52815050':
ADB sideload command not work
|
| | | |\ \ \ \ \ \ \
| | | |_|_|_|/ / /
| | |/| | | | | | |
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
In kernel(3.10) USB ADB gadget driver is removed.
Using Functionfs for USB adb gadget.
Android recovery uses a stripped down version
of adb command for sideload only. It's missing
the ffs function support, so add the ffs
support to allow sideload command to work
b/12608946
Change-Id: I4ad024723dfc5bdb544548391f99637c390b171e
Signed-off-by: Pierre Couillaud <pierre@broadcom.com>
|
| |\| | | | | | | |
| |_|_|/ / / / /
|/| | | | | | |
| | | | | | | |
| | | | | | | | |
* commit 'ed75be6de9d883a2524065940d732593fa26ac19':
recovery: Fix adb with linux 3.10
|
| | |\| | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* commit 'ac189bf645123b4dc79cd2053f5eb07917774d66':
recovery: Fix adb with linux 3.10
|
| | | |\ \ \ \ \ \
| | | |_|_|/ / /
| | |/| | | | | |
|
| | | |/ / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
In kernel 3.10, f_adb has been removed and adbd can use functionfs
instead. Mount functionfs on boot for adbd. On older kernels, mount
will fail silently and adbd will revert to f_adb.
Change-Id: I5db57aaf35b35859ea88c7d0e0661d8c553e5811
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
updater now depends on the GPL'd libraries libsyspatch and libxdelta3,
so be careful when taking code from this directory.
Change-Id: Ib6f8c50ce7052912b9d81ff96d095f778bf9a3d0
|
| |\ \ \ \ \ \ \ |
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Change-Id: I1541534ee6978ddf8d548433986679ce9507d508
|
| |\ \ \ \ \ \ \ \ |
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
When going into recovery mode withoug recovery command file present, uncrypt crashes
and the device gets stuck and eventually shuts down.
Check that the command file is present before trying to read from it.
Change-Id: If0192d597032be0067738e437188d92993ce56f7
|
| | |/ / / / / / /
|/| | | | | | |
| | | | | | | |
| | | | | | | | |
Change-Id: Id38b08607829bccc031693cc03e60e849903b6f8
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Older versions of android supported an ASLR system where binaries were
randomly twiddled at OTA install time. Remove support for this; we
now use the ASLR support in the linux kernel.
Change-Id: I8348eb0d6424692668dc1a00e2416fbef6c158a2
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Add the syspatch() function, which can apply xdelta3+xz patches using
the libsyspatch library.
Change-Id: Idc1921e449020923bcaf425a1983bec0833e47ed
|
| |/ / / / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
mzGetStoredEntry gives you a pointer and address to the data of a zip
entry, assuming that entry is stored rather than deflated.
Change-Id: Ifb39777c98d1d50475ef7de419cf28935f5f9965
|
| |\| | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* commit '2739ed9628f72813d213b7a429c4c1b8dcebe5fc':
recovery: fix building with pointer-to-int errors turned on
|
| | |\| | | | |
| | |_|/ / /
| |/| | | |
| | | | | |
| | | | | | |
* commit 'a5d105e2397d81537facd93fd8a9d3e263d57dc9':
recovery: fix building with pointer-to-int errors turned on
|
| | | |\ \ \ \ |
|
| | | |/ / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Use intptr_t/uintptr_t to cast between pointer and int to allow
building with -Werror=pointer-to-int-cast and
Werror=int-to-pointer-cast turned on.
Cast to char* instead of unsigned int for pointer arithmetic.
Change-Id: Ia862306fdcca53866b330e8cf726f3d62f2248a0
|
| |\| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* commit 'fd84f65dcda3c7e4b42c71a7df85efebdbf7ea7a':
minadbd: remove dead code
|
| | |\| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* commit 'f353207298ed14d0e6943353dd9788421a7537b8':
minadbd: remove dead code
|
| | | |\ \ \ \ |
|
| | | |/ / / /
| | | | | |
| | | | | |
| | | | | | |
Change-Id: Ia1f34a17ae582575f8cd3514ed7bc015b0a5006e
|
| |\| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* commit 'f464129950eaea49b1234fdcfd04ec8723e3c672':
adbd: switch to su domain when running as root
|
| | |\| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* commit '295e74aa20c9f32e1e46fc1b0bf0975642a8c95b':
adbd: switch to su domain when running as root
|
| | | |\ \ \ \
| | | |/ / /
| | |/| | | |
|
| | | |/ / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
When adbd runs as root, it should transition into the
su domain. This is needed to run the adbd and shell
domains in enforcing on userdebug / eng devices without
breaking developer workflows.
Use the new device_banner command line option.
Change-Id: Ib33c0dd2dd6172035230514ac84fcaed2ecf44d6
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Make recovery log its PID, and when we use a block map file, log how
many ranges it contains.
Change-Id: I1b4299f8163af68a770b48c029ae25e6cb45d26b
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
uncrypt can read a file on an encrypted filesystem and rewrite it to
the same blocks on the underlying (unencrypted) block device. This
destroys the contents of the file as far as the encrypted filesystem
is concerned, but allows the data to be read without the encryption
key if you know which blocks of the raw device to access. uncrypt
produces a "block map" file which lists the blocks that contain the file.
For unencrypted filesystem, uncrypt will produce the block map without
touching the data.
Bug: 12188746
Change-Id: Ib7259b9e14dac8af406796b429d58378a00c7c63
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Changes minzip and recovery's file signature verification to work on
memory regions, rather than files.
For packages which are regular files, install.cpp now mmap()s them
into memory and then passes the mapped memory to the verifier and to
the minzip library.
Support for files which are raw block maps (which will be used when we
have packages written to encrypted data partitions) is present but
largely untested so far.
Bug: 12188746
Change-Id: I12cc3e809834745a489dd9d4ceb558cbccdc3f71
|
| |\| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit 'a01b646794fc207da657d7b8ef779c9d842acfde':
correctly mount tmpfs as /tmp in recovery
|
| | |\| | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '772f6e2a8865934bb57aaeea8354a75a47ee753f':
correctly mount tmpfs as /tmp in recovery
|
| | | |\ \ \ |
|
| | | |/ / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The syntax of init's mount command changed in April 2008 but
recovery's init.rc was never updated, so recovery's /tmp has been on
the root fs all this time. Fix.
Also add /system/bin to the PATH in recovery, which is handy for
debugging.
Change-Id: I39f7ae435a8ce3bad691e4b7c307db0bd8de1302
|
| |\| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '7e0d30667cf53a182525f87dd0c8cb0e2628a1ed':
Set SELinux security contexts correctly for init and services.
|
| | |\| | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit 'fc729512375c4f0d351f6f67f0d7f500ea1b9233':
Set SELinux security contexts correctly for init and services.
|
| | | |\ \ \ |
|
| | | |/ / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Otherwise everything is left running in the kernel domain when
booting recovery.
Change-Id: Ie3d86547d5be0b68dd1875a97afe1e00fc3e4da1
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
minzip had some features that were used when reading APKs, but APK
handling now uses libziparchive instead of minzip. Remove these
unused functions.
Change-Id: Iead89209a716bfe9e3d339bf85b3e97e33a41f35
|
| |\| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '27efc8f9d1711134051b45d28b2fc38bfb4c7dc6':
minui: do not use flexible array initialization
|
| | |\| | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '617d1cadc6e0e1e9fd46e0e6a8505f6f7f56a5f7':
minui: do not use flexible array initialization
|
| | | |\ \ \ |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Avoiding the use of gnu extensions improves code portability
Change-Id: I441a49ce08b6ecb1d735ca453552fa92026c5016
|
| |\| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* commit '15f5fe1bcd2bf18b07f89d0cc58dcffb5bc1f932':
Don't abort on read_file if the file is missing.
|
| | |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* commit 'f9dd42de6034ab09f9fa649ed1fbea25bc05e598':
Don't abort on read_file if the file is missing.
|
| | | |\ \ \ \ \ |
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Change-Id: I85726bf736203d602428114145c3b98692580656
|
| |\| | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* commit 'e1bb2733f9261336f38a94dc9d93ed010a7cbc57':
fix unnecessarily slow writing of EMMC partitions
|
| | |\| | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* commit '168724c31ad5241e157ebb35135a734fa075d53b':
fix unnecessarily slow writing of EMMC partitions
|
| | | |/ / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
These were attempts to write partitions "conservatively" in hopes of
fixing the problems with writing the radio partition on Nexus 4. They
didn't work (a kernel patch was needed), but got left in. They make
writing of partitions unnecessarily slow (ie, we really shouldn't need
to sync() after every 4kb). Roll back most of them, but leave the
verification read-back in.
Change-Id: I94badc0979e88816c5aa0485f6316c02be69173c
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
This assumes that the metadata is correctly defined in fstab.
Which apparently some devices don't do.
Bug: 8766487
Bug: 12112624
Change-Id: I1b14b9d4c888e9348527984be3dce04bdd9f4de0
|
| |\| | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* commit 'd327c63af691a36fbf53866a3ae7ad27a43ebe3b':
add the functions for multi-stage packages to updater
|
| | |\| | | | |
| | |/ / / /
| |/| | | |
| | | | | |
| | | | | | |
* commit 'c87bab101893e8322b49d7c8600e3367b20ab50a':
add the functions for multi-stage packages to updater
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
In order to support multi-stage recovery packages, we add the
set_stage() and get_stage() functions, which store a short string
somewhere it can be accessed across invocations of recovery. We also
add reboot_now() which updater can invoke to immediately reboot the
device, without doing normal recovery cleanup. (It can also choose
whether to boot off the boot or recovery partition.)
If the stage string is of the form "#/#", recovery's UI will be
augmented with a simple indicator of what stage you're in, so it
doesn't look like a reboot loop.
Change-Id: I62f7ff0bc802b549c9bcf3cc154a6bad99f94603
|
| |\ \ \ \ \ \ |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Because backgroundIcon[] is not initialized by the ScreenRecoveryUI
constructor, it should be initialized explicitly to NULL in Init().
If it is not initialized, ScreenRecoveryUI::SetBackground() can fail
for the NONE icon because the NULL test can fail and junk will be
dereferenced.
Change-Id: I4e3738d2e241ed90df43c984fb41e0072933f50a
|
| |/ / / / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
A system/core change made in Mar 26 2012 6ebf12f "init: Change umask
of forked processes to 077" changed the default umask of services
forked from init.
Because recovery is forked from init, it has a umask of 077. Therefore
when update-binary is forked from recovery, it too has a umask of 077.
This umask is overly restrictive and can cause problems for scripts
relying on minzip to extract binaries directly into the target
filesystem. Any directories updated by minzip will have their
permissions reset to r-x------ and created files will have similarly
restrictive permissions.
As it seems unlikely this security measure was intended to have this
side effect on legacy sideloads that do not have chmods to repair
the damage done by minzip, this change reverts the umask to 022 in
the fork made for update-binary.
Change-Id: Ib1a3fc83aa4ecc7480b5d0c00f3c7d0d040d4887
|
| |\| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* commit '40dfc474c457f5be24e204e6a0c657c97acb8f3c':
Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add.
|
| | |\| | | |
| | |/ / /
| |/| | |
| | | | |
| | | | | |
* commit 'c64e76c75088b951f61a7f7bacf8af6eccd2ccfa':
Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add.
|
| | | |\ \ \ |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
try to process them via patch + rename, instead of
delete + add.
b/11437930
Change-Id: I984349fbc9a8dac4379e00c0d66fc7d22c4eb834
|
| |\| | | | |
| | | | | |
| | | | | |
| | | | | | |
* commit 'a370c0f7fe65d6f012902342249d3a84b474f277':
|
| | |\| | | |
| | | | | |
| | | | | |
| | | | | | |
* commit '3966c571a0c36a40a8142e70b1aa6de547ea6ec3':
|
| | | |\ \ \ \
| | | |/ / /
| | |/| | | |
|
| | | | |\ \ \ |
|
| |\| | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* commit 'fc7eab961f9dc85ee88e8c37ca1dc31a7f7b8331':
Add support for ECDSA signatures
|
| | |\ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* commit 'f4a6ab27b335b69fbc419a9c1ef263004b561265':
Add support for ECDSA signatures
|
| | | |\ \ \ \ \ \
| | | |_|_|_|/ /
| | |/| | | | | |
|
| | | |/ / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
This adds support for key version 5 which is an EC key using the NIST
P-256 curve parameters. OTAs may be signed with these keys using the
ECDSA signature algorithm with SHA-256.
Change-Id: Id88672a3deb70681c78d5ea0d739e10f839e4567
|
| |\| | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* commit '053c1c5e89136bd78c39c9e4a300d95f1cb3772d':
Don't apply permission changes to symlink.
recovery: fix use of init reboot method
|
| | |\ \ \ \ \ \
| | | |/ / / /
| | |/| | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* commit '7fdeb1f9d7c1e979ebf78725bbf000bcb8c6ffc3':
Don't apply permission changes to symlink.
recovery: fix use of init reboot method
|
| | | |\ \ \ \ \
| | | |_|/ / /
| | |/| | / /
| | | | |/ /
| | | |/| | |
|
| | | | |\ \ \ |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Bug: 10183961
Bug: 10186213
Bug: 8985290
Change-Id: I57cb14af59682c5f25f1e091564548bdbf20f74e
|
| | | | | |\ \ \ |
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
We need to set the system property to "reboot,", not an empty string.
Bug: 10605007
Change-Id: I776e0d273764cf254651ab2b25c2743395b990e0
|
| |\| | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* commit 'efef45ede6f7588bd3f584d7746ca9822ade58ac':
Allow child classes to override the overlay location for the update image.
|
| | |\| | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* commit 'a2a1ce823b8c76451ee2b38155b347b0c2ced714':
Allow child classes to override the overlay location for the update image.
|
| | | |/ / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
update image.
b/10952479
Change-Id: I59bb834f271f702fb529054dab7926b816fa35cc
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Bug: 10934401
Change-Id: I471b30e5b2e877c620e4a0a524e950cddbc6d2c0
|
| |\| | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* commit 'dd92a4d625a6735651efeb12a5707620bc5c6339':
verifier: update to support certificates using SHA-256
|
| | |\ \ \ \ \ \
| | | |_|_|/ /
| | |/| | | |
| | | | | | |
| | | | | | | |
* commit '58c60900ac3682fab08f64373bdd1020713b48f7':
verifier: update to support certificates using SHA-256
|
| | | |\ \ \ \ \ |
|
| | | |/ / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
(cherry picked from commit bac7fba02763ae5e78e8e4ba0bea727330ad953e)
Change-Id: I01c38d7fea088622a8b0bbf2c833fa2d969417af
|
| |\| | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* commit '46ab1b6138bf911120280f1095ff9479dceee3df':
updater: Delete dead code
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
set_perm and set_perm_recursive are no longer used. Delete.
(cherry picked from commit 08ef9a957027183dcf55e432441e8fb0d5299aba)
Change-Id: I1bcc90ae19af9df4f0705496c5876987159f75ac
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Change-Id: I5db9987102201c18821acb45d1f824e9865a1451
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Change-Id: I431ece69b6856fd1ea6079c38cdeb593c15d7385
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
To allow use of ev_* functions with an external main loop.
Change-Id: If73717b64d7c455ca726b90a815a31c1edf52544
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Convert callback events parameter to unsigned int.
Change-Id: Ife0e983f307c07bf4aca807d70574aeb20c460cd
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Help enable external main loop combined with ev_*() key event processing.
Specify EPOLLWAKEUP to hold a wakelock on any event, assuming this is needed
(may need to make this optional).
Convert callback events parameter to unsigned int.
Change-Id: Ib5e09abbd7724ffd830e2cf8e25e7eb59d3aa072
|
| |\| | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* commit '1306a7effafab77cf2769091619518c2ab263ee8':
fix secure adb in recovery
|
| | |\ \ \ \ \ \
| | | |/ / / /
| | |/| | | |
| | | | | | |
| | | | | | | |
* commit 'cc2958fd7f32f79d1a034eee005e04afeb310a87':
fix secure adb in recovery
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Recovery's init.rc was missing a line (added to the main system's
init.rc in change Ic97fd464440ff4a29fc9da7ad15949ac5215ade3) is
required for secure adb to work.
Change-Id: Id79b94d2abb4cbe3cca7cabeb4bc5faf7205e56b
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
set_perm and set_perm_recursive are no longer used. Delete.
Change-Id: I3bb40b934b6c093b24b88aa4ed6f3c7de2bb52f0
|
| |\| | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* commit 'af677d786e6333187ccbd4f7fe6f371a09b71645':
Don't apply permission changes to symlink.
|
| | |\| | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* commit 'e461251e2caa5561cf6a315bffaebfd4eb896b1d':
Don't apply permission changes to symlink.
|
| | | | |/ / /
| | |/| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Bug: 10183961
Bug: 10186213
Bug: 8985290
Change-Id: I57cb14af59682c5f25f1e091564548bdbf20f74e
|
| |\| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* commit 'cc421662d7f9b68627204b8c8bfb4a5cada74125':
updater: introduce and set_metadata and set_metadata_recursive
|
| | |\| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* commit '5dbdef0e5b8a841fadc64d016d10ce81a962b284':
updater: introduce and set_metadata and set_metadata_recursive
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Introduce two new updater functions:
* set_metadata
* set_metadata_recursive
Long term, these functions are intended to be more flexible replacements
for the following methods:
* set_perm
* set_perm_recursive
Usage:
set_metadata("filename", "key1", "value1", "key2", "value2", ...)
set_metadata_recursive("dirname", "key1", "value1", "key2", "value2", ...)
Description:
set_metadata() and set_metadata_recursive() set the attributes on a file/directory
according to the key/value pairs provided. Today, the following keys are
supported:
* uid
* gid
* mode (set_perm_extd only)
* fmode (set_perm_extd_recursive only)
* dmode (set_perm_extd_recursive only)
* selabel
* capabilities
Unknown keys are logged as warnings, but are not fatal errors.
Examples:
* set_metadata("/system/bin/netcfg", "selabel", "u:object_r:system_file:s0");
This sets the SELinux label of /system/bin/netcfg to u:object_r:system_file:s0.
No other changes occur.
* set_metadata("/system/bin/netcfg", "uid", 0, "gid", 3003, "mode", 02750, "selabel", "u:object_r:system_file:s0", "capabilities", 0x0);
This sets /system/bin/netcfg to uid=0, gid=3003, mode=02750,
selinux label=u:object_r:system_file:s0, and clears the capabilities
associated with the file.
* set_metadata_recursive("/system", "uid", 0, "gid", 0, "fmode", 0644, "dmode", 0755, "selabel", "u:object_r:system_file:s0", "capabilities", 0x0);
All files and directories under /system are set to uid=0, gid=0,
and selinux label=u:object_r:system_file:s0. Directories are set to
mode=0755. Files are set to mode=0644 and all capabilities are cleared.
Bug: 10183961
Bug: 10186213
Bug: 8985290
Change-Id: Ifdcf186a7ed45265511dc493c4036e1ac5e3d0af
|
| |\| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* commit '5ae88e899836e7e3350db55ac47aee6f219cf126':
Revert "Update OTA installer to understand SELinux filesystem labels"
|
| | |\| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* commit '3328e3bc81161c2a57ea94d304162276facdd826':
Revert "Update OTA installer to understand SELinux filesystem labels"
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This reverts commit 627eb30f73c29257acaeb6568f3da38880784f7c.
Bug: 10183961
Bug: 10186213
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Also provide a default implementation of CheckKey that's reasonable
for many devices (those that have power and volume keys).
Change-Id: Icf6c7746ebd866152d402059dbd27fd16bd51ff8
|
| |\| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* commit 'f187a5438d5a0651c344038f2203469e193704f9':
recovery: fix use of init reboot method
|
| | |\| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* commit '3b5a987cd7fd76c038e9875b430028216d21ace3':
recovery: fix use of init reboot method
|
| | | | |/ /
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
We need to set the system property to "reboot,", not an empty string.
Bug: 10605007
Change-Id: I776e0d273764cf254651ab2b25c2743395b990e0
|
| |\| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '366f78a9df45d6648746de8454655224b22c31fd':
recovery: fix rebooting
|
| | |\| | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '77ea71d6a85a93c9bf423466e87661b1bf67c512':
recovery: fix rebooting
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Change I84c0513acb549720cb0e8c9fcbda0050f5c396f5 moved reboot
functionality into init but did not update the recovery partition; so
"adb reboot" and /system/bin/reboot in recovery are both broken.
Change-Id: Ie2d14627a686ffb5064256b6c399723636dff116
|
| |\| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '19877de513a9493dad77488144089b4f30103b74':
Update libpng API usage
|
| | |\ \ \ \
| | |/ / /
| |/| / /
| | |/ /
| | | | |
* commit '5c4e1dac0bd8f31559bd50eec4343b7a17b7a976':
Update libpng API usage
|
| | | |\ \ |
|
| | | |/ /
| | | |
| | | |
| | | |
| | | |
| | | | |
Remove usage of deprecated methods
Change-Id: I747568a2c8c0c65ecbc9a3da4bac7b9cac7708ab
|
| |\| | |
| | | |
| | | |
| | | |
| | | | |
* commit '239ac6abac4524be93fce710360c0512c6cc2ab3':
recovery: install packages in a known mount environment
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When installing a package, we should have /tmp and /cache mounted and
nothing else. Ensure this is true by explicitly mounting them and
unmounting everything else as the first step of every install.
Also fix an error in the progress bar that crops up when you do
multiple package installs in one instance of recovery.
Change-Id: I4837ed707cb419ddd3d9f6188b6355ba1bcfe2b2
|
| |/ / /
| | |
| | |
| | |
| | |
| | | |
Remove usage of deprecated methods that were removed in 1.6
Change-Id: I2a669bf5201197f60adfdbe512fd729bebb74f9c
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Recovery changes:
- add a method to the UI class that is called when a key is held down
long enough to be a "long press" (but before it is released).
Device-specific subclasses can override this to indicate a long
press.
- do color selection for ScreenRecoveryUI's menu-and-log drawing
function. Subclasses can override this to customize the colors they
use for various elements.
- Include the value of ro.build.display.id in the menu headers, so you
can see on the screen what version of recovery you are running.
Change-Id: I426a6daf892b9011638e2035aebfa2831d4f596d
|
| |\ \ \ |
|
| | | | |
| | | |
| | | |
| | | | |
Change-Id: I16e3e0ddb8ca062431deb4be83c5be5eb786d76f
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Modify the OTA installer to understand SELinux filesystem labels.
We do this by introducing new set_perm2 / set_perm2_recursive
calls, which understand SELinux filesystem labels. These filesystem
labels are applied at the same time that we apply the
UID / GID / permission changes.
For compatibility, we preserve the behavior of the existing
set_perm / set_perm_recursive calls.
If the destination kernel doesn't support security labels, don't
fail. SELinux isn't enabled on all kernels.
Bug: 8985290
Change-Id: I99800499f01784199e4918a82e3e2db1089cf25b
|
| |\ \ \ \
| | |/ /
| |/| |
| | | |
| | | | |
* commit 'a69b50c567d46afad73c4d6ab9e57f078ee73327':
recovery: remove O_DIRECT, use O_SYNC only
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '901b898d5e4d7cc555974b8132f83f948f8fbaee':
recovery: remove O_DIRECT, use O_SYNC only
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
O_DIRECT writes fail with EINVAL due to alignment issues.
Change-Id: If8cf38a636313e4f4b4e61e66287dc903c473e5b
|
| |\| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '660637f3fc6fe20e8b7f47b98152138c2c92b7ec':
recovery: more cargo-cult programming
|
| | |\| | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit 'e8d953aa7ed0c16beb1b03a05d16cb23dd85e198':
recovery: more cargo-cult programming
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Add O_DIRECT|O_SYNC when opening partitions for write.
Change-Id: I9825ad8e60fba87e482f8abc5593d6f54a1e3a1c
|
| |\| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '51ffaf54a56441bba053d37a00122761c3a18f16':
recovery: sleep after writing partition and closing it
|
| | |\ \ \ \
| | | | | |
| | | | | |
| | | | | | |
Change-Id: Id35004f465f5152c1de0796eb66989f234185208
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Another speculative attempt to get everything we write actually stored
to the device.
Change-Id: Icf40b0741b4c535e55ea34848073a97d90dc0e70
|
| |\| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* commit 'fbcfad33face5d3b9e6b8cb04379168bceb517df':
recovery: sleep after writing partition and closing it
|
| | |\ \ \ \ \
| | | |/ / /
| | |/| | |
| | | | | |
| | | | | | |
* commit 'bf4a69ac41696fe78f6cc67b10cf1816186f1c5d':
recovery: sleep after writing partition and closing it
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Another speculative attempt to get everything we write actually stored
to the device.
Change-Id: Icf40b0741b4c535e55ea34848073a97d90dc0e70
|
| |\| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* commit 'e352c88fbcfd917f6614597364d2e550aa691e79':
recovery: write partitions more conservatively
recovery: try to write EMMC partitions more reliably
|
| | |\ \ \ \ \
| | | |/ / /
| | |/| | |
| | | | | | |
Change-Id: Ib99b7cd6aede63006c91be2635112e16dd0f2b24
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Write and verify partitions using write(2) and read(2) rather than the
stdio functions. Read and write in 4kb blocks. When writing, fsync()
every 1MB.
Bug: 9602014
Change-Id: Ie98ce38e857786fc0f4ebf36bb5ffc93b41bc96f
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Nexus 4 has flash errors that manifest during large writes (eg, of the
radio partition). Writes of some blocks seem to be dropped silently,
without any errors being returned to the user level.
Make two changes to the partition-writing code:
- break it up into 1MB writes instead of writing partitions with a
single fwrite() call. Pause for 50ms in between every chunk.
- read the partition back after writing and verify that we read what
we wrote. Drop caches before reading so we (hopefully) are reading
off the actual flash and not some cache.
Neither of these should be necessary.
Bug: 9602014
Change-Id: Ice2e24dd4c11f1a57968277b5eb1468c772f6f63
|
| |\| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* commit '2148133d46cb875316b01947dd5719ed995f7d67':
recovery: write partitions more conservatively
|
| | |\ \ \ \ \
| | | |/ / /
| | |/| | |
| | | | | |
| | | | | | |
* commit 'c870a99c4aeb9e232ee68951e666b5fa670d1680':
recovery: write partitions more conservatively
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Write and verify partitions using write(2) and read(2) rather than the
stdio functions. Read and write in 4kb blocks. When writing, fsync()
every 1MB.
Bug: 9602014
Change-Id: Ie98ce38e857786fc0f4ebf36bb5ffc93b41bc96f
|
| |\ \ \ \ \ \ |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
When doing a cache wipe or a factory reset (which includes a cache
wipe), save any last* log files in the /cache/recovery directory and
write them back after reformatting the partition, so that wiping data
doesn't lose useful log information.
Change-Id: I1f52ae9131760b5e752e136645c19f71b7b166ee
|
| |/ / / / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Recovery currently has a random mix of messages printed to stdout and
messages printed to stderr, which can make logs hard to read. Move
everything to stdout.
Change-Id: Ie33bd4a9e1272e731302569cdec918e0534c48a6
|
| |\| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* commit '0ccaccf7d0f50bb9555ee13a841c246a1fea80f2':
recovery: try to write EMMC partitions more reliably
|
| | |\| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* commit '044a0b4d49a11edfa13471ce20914b0514eb7e0e':
recovery: try to write EMMC partitions more reliably
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Nexus 4 has flash errors that manifest during large writes (eg, of the
radio partition). Writes of some blocks seem to be dropped silently,
without any errors being returned to the user level.
Make two changes to the partition-writing code:
- break it up into 1MB writes instead of writing partitions with a
single fwrite() call. Pause for 50ms in between every chunk.
- read the partition back after writing and verify that we read what
we wrote. Drop caches before reading so we (hopefully) are reading
off the actual flash and not some cache.
Neither of these should be necessary.
Bug: 9602014
Change-Id: Ice2e24dd4c11f1a57968277b5eb1468c772f6f63
|
| |\| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* commit '4d4b233eae51d5580b58cb00d3aa45ecbb1b255e':
recovery: init backgroundIcon properly to avoid recovery mode crash
|
| | |\| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* commit '2f6877a0220475303907203308c018d789ea1a53':
recovery: init backgroundIcon properly to avoid recovery mode crash
|
| | | |/ / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
We met factory issue that some devices would crash in recovery mode
because the backgroundIcon array did not reset to NULL when initializing.
Bug: 9568624
Change-Id: I13c7a7cc1053a7ffdbadd71740c1a2b4a2af6bba
Signed-off-by: yetta_wu <yetta_wu@asus.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
We met factory issue that some devices would crash in recovery mode
because the backgroundIcon array did not reset to NULL when initializing.
Bug: 9568624
Change-Id: I13c7a7cc1053a7ffdbadd71740c1a2b4a2af6bba
Signed-off-by: yetta_wu <yetta_wu@asus.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
|
| | |_|/ /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Copy logs to /cache immediately upon a package installation failure;
don't wait for recovery to finish. (If the user reboots without
exiting recovery the "right" way, the logs never get copied at all.)
Change-Id: Iee342944e7ded63da5a4af33d11ebc876f6c0835
|
| |\| | |
| | | |
| | | |
| | | |
| | | | |
* commit '8cd12112e444e01163526fe6ab237f6164b0018b':
Fix the potential segmentation fault
|
| | |\ \ \
| | |/ /
| |/| |
| | | |
| | | | |
* commit 'd51bfc9b1fe89321af3c629e7b23a747050332e1':
Fix the potential segmentation fault
|
| | | |\ \ |
|
| | | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Extral newline can trigger recovery segmentation fault
Test case:
host$ adb shell 'echo -en "--update_package=ota_update.zip\n--show_text\n\n" > /cache/recovery/command'
host$ adb reboot recovery
Change-Id: If1781c1f5ad94a273f1cb122b67cedd9fb562433
Signed-off-by: Jin Feng <jin88.feng@gmail.com>
|
| |\| | |
| | | |
| | | |
| | | |
| | | | |
* commit 'da1ebaef0aa8e38db6edf8bfc3d96290461a424f':
recovery: save logs from the last few invocations of recovery
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Extends the last_log mechanism to save logs from the last six
invocations of recovery, so that we're more likely to have useful logs
even if the device has repeatedly booted into recovery.
Change-Id: I08ae7a09553ada45f9e0733fe1e55e5a22efd9f9
|
| |\| | |
| | | |
| | | |
| | | |
| | | | |
* commit '7c3ae45ef9306d2ff4b491e0488c8849bf15ce90':
recovery: turn on text display for install errors in debug builds
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Hopefully this will reduce the number of OTA "bugs" reported that are
really just someone having changed their system partition,
invalidating future incremental OTAs.
Also fixes a longstanding TODO about putting LOGE() output in the
on-screen display.
Change-Id: I44e5be65b2dee7ebce2cce28ccd920dc3d6e522e
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Extends the last_log mechanism to save logs from the last six
invocations of recovery, so that we're more likely to have useful logs
even if the device has repeatedly booted into recovery.
Change-Id: I08ae7a09553ada45f9e0733fe1e55e5a22efd9f9
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Hopefully this will reduce the number of OTA "bugs" reported that are
really just someone having changed their system partition,
invalidating future incremental OTAs.
Also fixes a longstanding TODO about putting LOGE() output in the
on-screen display.
Change-Id: I44e5be65b2dee7ebce2cce28ccd920dc3d6e522e
|
| |\ \ \ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Change-Id: Ifd5a29d459acf101311fa1c220f728c3d0ac2e4e
|
| |\ \ \ \ \
| |/ / / /
|/| / / /
| |/ / /
| | | | |
* commit '4e21482d979f6f81b34f92e664adf137555d4504':
Add liblog
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Bug: 8580410
Change-Id: Ie60dade81c06589cb0daee431611ded34adef8e6
|
| |\| | |
| | | |
| | | |
| | | | |
* commit 'b5bd4fb79544b1939e9f977a88a707bdc90cf66c':
|
| |/| | |
| | | |
| | | |
| | | | |
* commit '2f50df0058dff23fbdfc6b123bb92aaa90aea09b':
|
| | |\ \ \
| | |/ /
| |/| |
| | | | |
* commit 'c09444eb5b66a5702db99d9b7de23cb73bf11aa4':
|
| | | |\ \
| | | | |
| | | | |
| | | | | |
* commit 'f91bd41c46ec8bd085c361ea0bdf53efe13c87ca':
|
| | | | |\ \
| | | | | |
| | | | | |
| | | | | | |
* commit '1c302cafdd793ae250f767b88da718b916751feb':
|
| | | | |/| |
| | | | | |
| | | | | |
| | | | | | |
* commit 'c14a7fbd895aed1ce34c0682ece5ef361f21dd1c':
|
| | | | | |\ \ |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Get rid of the notion of a font's "ascent"; the reference point for
drawing is the top-left corner of the character box rather than the
baseline. Add some more space between the menu entries and make the
highlight bar around the text.
Replace the default font.png with two images; the build system will
include one or the other based on the resolutions of the device.
Restore the original compiled-in bitmap font, to fall back on when
font.png can't be found (eg, in the charger binary).
Add support for bold text (when a font.png image is used).
Change-Id: I6d211a486a3636f20208502b1cd2aeae8b9f5b02
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Instead of representing the font used for menus and log messages in
the recovery binary, load it from a resource PNG image. This allows
different devices to substitute their own font images.
Change-Id: Ib36b86db3d01298aa7ae2b62a26ca29e6ef18014
|
| |\| | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* commit 'ec838b885dd8b74b8682dd2498c7da8f7afca291':
minadbd: remove unnecessary header files.
|
| | |\ \ \ \ \ \ |
|
| | |/ / / / / /
| | | | | | |
| | | | | | |
| | | | | | | |
Change-Id: Iff2b53d9e63b279d0262cd2e9cfb11e0ca4d6b42
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Change-Id: Ifa7a3aa5e2e3fd5d13266115d592bbfd0aa309c5
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Instead of reading it's own fstab, have recovery invoke
fs_mgr to read the unified fstab.
Change-Id: I80c75d2c53b809ac60a4a69f0ef7ebfa707c39e9
|
| |\| | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* commit 'f7d423403d0aed6b8488559185e2246257abc58b':
add optional overscan compensation to recovery graphics
|
| | |\| | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* commit 'c560a67b12350102ba237fa70cedc7c972ad4e4b':
add optional overscan compensation to recovery graphics
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
If your screen is a TV, it may not actually be displaying the edges of
the framebuffer. Allow specifying an overscan percentage, and move
each edge of the framebuffer in by that percent of the width/height.
(The gr_* layer just lies to the caller about the size of the
framebuffer, telling the caller it's smaller than it really is, and
offsets all drawing commands to match.)
Change-Id: I11bb2feb39ae522bd3e957a14ebdecf3609e0fdc
|
| |\| | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* commit '6a1d21a0ceb1fb46e9113f3d2a81390612806dfd':
add NextCheckKeyIsLong() and EnqueueKey() methods
|
| | |\| | | | |
| | |_|_|_|/
| |/| | | |
| | | | | |
| | | | | | |
* commit 'bb01d0c12b29e6ff4a9169c21c95408e7eb882c5':
add NextCheckKeyIsLong() and EnqueueKey() methods
|
| | | |/ / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
NextCheckKeyIsLong() is called right before each call to CheckKey() to
tell the implementation if the key is a long-press or not. (To be
used on devices with few buttons.) It's done as a separate method
(rather than a parameter to CheckKey) to not break existing recovery
UI implementations.
EnqueueKey() can be called from CheckKey() to put arbitrary code codes
in the synchronous queue (to be processed by HandleMenuKey).
Change-Id: If8a83d66efe0bbc9e2dc178e5ebe12acd216324b
|
| |\| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '9028fb4d4ceed040c7d3ae9b1ceaa5a7472856ba':
Pass the correct pointer to munmap on failure.
|
| | |\ \ \ \ |
|
| | |/ / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This won't ever happen, and you're probably screwed anyway if it
does, but that's no excuse...
Change-Id: I2c56f607e351e84308a72b41b834d13aaa98fc62
|
| |\| | | |
| | | | |
| | | | |
| | | | | |
* commit '27f31606390eeed50d27f2c243dfbfe79e8b5ae2':
|
| | |\| | |
| | | | |
| | | | |
| | | | | |
* commit 'aa0dbb25a0ae51a8e53018fe05bf59164d9804cb':
|
| | | | \ \ | |
| | | | \ \ | |
| | | |\ \ \ \
| | | |_|/ /
| | |/| | /
| | | | |/ |
Change-Id: Ibef4c059b7a7e055fe562c60656a9f7f7de4841a
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Add an option to verifier_test to load keys from a file, the way the
recovery does.
Change-Id: Icba0e391164f2c1a9fefeab4b0bcb878e91d17b4
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Make minzip log only a count of files when extracting, not individual
filenames. Make patching only chatter about free space if there's not
enough and compact the other messages.
Only the last 8k of the recovery log gets uploaded; this makes it more
likely that we will get all of it.
Change-Id: I529cb4947fe2185df82b9da5fae450a7480dcecd
|
| |\| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit 'cd74108cdac228e946ca8b6ea2ff11ab62941a6d':
Remove HAVE_SELINUX guards
|
| | |\ \ \ \
| | | | | |
| | | | | |
| | | | | | |
Change-Id: I861e3a6aa07c448909b2ae54618bba178bd6e457
|
| | | |\ \ \ \ |
|
| | | |/ / / /
| | | | | |
| | | | | |
| | | | | | |
Change-Id: Ia96201f20f7838d7d9e8926208977d3f8318ced4
|
| |\| | | | |
| | | | | |
| | | | | |
| | | | | | |
* commit 'd0d4d44d344779e59ee196637bbc745d68d70677':
|
| | | \ \ \ \ | |
| | | \ \ \ \ | |
| | |\ \ \ \ \ \
| | | |_|_|/ /
| | |/| | | /
| | | | |_|/
| | | |/| | |
Change-Id: I3afa60bf8978d750c7072128e9f5e87c5d624b36
|
| | | | |\ \ \
| | | | |_|/
| | | |/| | |
|
| | | |\ \ \ \
| | | |/ / /
| | |/| / /
| | | |/ / |
|
| |\| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '4b57f8f2affade295ec856e2bc63ba02e9f079c4':
recovery: fix failure to unmount "/cache"
|
| | |\| | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '6016d08b0c3b682f1f7000b42a9ea4b6b6d74f22':
recovery: fix failure to unmount "/cache"
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
At load_locale_from_cache() function, LOCALE_FILE must get closed
after it is opened and used. Otherwise it causes a failure to
unmount "/cache" after load_locale_from_cache() function is called.
Change-Id: I9cec0f29a8ec4452c8a6a52e2f3c8ce9930d5372
Signed-off-by: Iliyan Malchev <malchev@google.com>
|
| |\| | | |
| | | | |
| | | | |
| | | | | |
* commit '2c3d1d83d5f28160baa5cbec782d518fa186af73':
|
| | |\ \ \ \
| | | |/ /
| | |/| |
| | | | | |
Change-Id: I692d63796f64702243898ae1d20d8ce073dc15e6
|
| | | |\ \ \
| | | |/ /
| | |/| | |
|
| |\| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '80fb68181e2a396de97c3d1b2d7c9e736cec4417':
revert to tacky 3D recovery animation
|
| | |\| | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '8347cb2d813b9a8b7c9165aadaea0b699eb5082f':
revert to tacky 3D recovery animation
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Bug: 7204420
Change-Id: I16d3346ce54b1aa5a0e6a02839ae9fbd4718fffa
|
| |\| | | |
| | | | |
| | | | |
| | | | | |
* commit '6cc3ded278818e2897459bdfdc5a5fb4b9ef3071':
|
| | |\ \ \ \
| | | |/ /
| | |/| |
| | | | | |
Change-Id: I887d27a16a0713ca92f3b2ebc570033cdb8759fb
|
| | | |\ \ \
| | | |/ /
| | |/| | |
|
| |\| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit 'a8db3764010310045f63bf8da860a9529b948133':
display error state on OTA failure
|
| | |\| | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '6c8553dda8b7fb45adc9f48a294c130b7e283f40':
display error state on OTA failure
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
We need prompt_with_wait() to show either the ERROR or NO_COMMAND
state as appropriate.
Bug: 7221068
Change-Id: I191526cf12630d08b7a8250a2a81e724a4a5d972
|
| |\| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '15eaee40a19c0d7391b5f209e4336e889be43297':
tweak recovery text images
localization for recovery messages
|
| | |\ \ \ \
| | | |/ /
| | |/| |
| | | | | |
Change-Id: Ifa58ce936a9bf0a9e95f46eebcb4f64c772aa5ba
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Center and fix the extents for those locales that have multiple lines
of text. Add Urdu as an RTL language.
Bug: 7064142
Change-Id: I4c1aa1198be29cab01129dabf2c4a026b93719a6
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Add images of text for all locales we support. Make the progress bar
fill the correct way for RTL languages. (Flip the direction the
spinner turns, too, just for good measure.)
Bug: 7064142
Change-Id: I5dddb26e02ee5275c57c4dc4a03c6d68432ac7ba
|
| |\| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '42afb5457f75cffb29a6d658fbf17961210080fd':
tweak recovery text images
|
| | |\ \ \ \
| | | |/ /
| | |/| |
| | | | |
| | | | | |
* commit 'b66cb69e3933d5f56f06d88cd31817f49d87df5f':
tweak recovery text images
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Center and fix the extents for those locales that have multiple lines
of text. Add Urdu as an RTL language.
Bug: 7064142
Change-Id: I4c1aa1198be29cab01129dabf2c4a026b93719a6
|
| |\| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit 'ed3bc11e7dd4b6e0ddb77a3c9492675d8ac6855d':
localization for recovery messages
|
| | |\| | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '5fa8c23911759a9e81af0e7fb5eb431277b8e9a6':
localization for recovery messages
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Add images of text for all locales we support. Make the progress bar
fill the correct way for RTL languages. (Flip the direction the
spinner turns, too, just for good measure.)
Bug: 7064142
Change-Id: I5dddb26e02ee5275c57c4dc4a03c6d68432ac7ba
|
| |\| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '74a806e5efbfd4a37725f2f1e193c3c2eb973fb7':
fix format of installing_text
|
| | |\ \ \ \
| | |/ / /
| |/| / /
| | |/ / |
Change-Id: Ia9cde557f8e6abaf0935e6b238eb956be09c12ca
|
| | |/| | |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Was submitted in the wrong PNG format (color type 4 instead of 0).
Change-Id: I8780c81eb92bdfc407b43948a92b37d93026325a
|
| |\| | |
| | | |
| | | |
| | | |
| | | | |
* commit '52eeea4fa59c15ecb09c32b8e05653f4e55f5188':
minor recovery fixes
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
- protect against missing/malformed bitmaps: fail to display them but
don't crash.
- don't draw animation overlays until the overlay offset is computed.
- logging cleanup
Change-Id: Ieb1c155cfbb11e643000bdb5d1a57900c8757739
|
| |\| | |
| | | |
| | | |
| | | |
| | | | |
* commit 'f4c6ec84c24611856374353bdef87baca5694cc0':
fix format of installing_text
|
| | |/ /
| | |
| | |
| | |
| | |
| | | |
Was submitted in the wrong PNG format (color type 4 instead of 0).
Change-Id: I8780c81eb92bdfc407b43948a92b37d93026325a
|
| |\| |
| | |
| | |
| | |
| | | |
* commit 'aff4dbb0ae33e55785d1a11f93c1e20ebfed4a90':
recovery locale handling fixes
|
| | |\ \ |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
- change locale filename to "last_locale" so the main system doesn't
delete it
- clean up some chatty logging
- update images with real German (other languages TBD)
Change-Id: I2ebb4ed4e054bd1808a3042d9efbb2c18f3a044d
|
| |\| | |
| | | |
| | | |
| | | |
| | | | |
* commit 'd52ef348d5abb65cd067be334d37c86d621786b9':
Fixing trivial warnings for libminui
|
| | |\ \ \
| | | |/
| | |/|
| | | |
| | | | |
* commit 'bddbb5b370d925d6e5ae62d560f5e7ad09a6ffac':
Fixing trivial warnings for libminui
|
| | | |\ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
After fixing three trivial warnings, libminui builds cleanly with clang.
Change-Id: Id7c6228295427a5ed3c774c5f90e88a28336c1f7
Author: Edwin Vane <edwin.vane@intel.com>
Reviewed-by: Kevin P Schoedel <kevin.p.schoedel@intel.com>
|
| |\| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '3474ab2888838e512c6bcff588fa88f02c81135f':
Add libm due to libpng dependency.
|
| | |\ \ \ \
| | |_|_|/
| |/| | | |
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Change-Id: I0bdc2df5ef358813587f613a1b50eaa850e95782
|
| |\| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit 'e630d945f90a3a5610529b761ea9638929949a2e':
Fixed warnings in libmtdutils
|
| | |\ \ \ \
| | | |/ /
| | |/| |
| | | | |
| | | | | |
* commit '6a693d57687a18f8e032293b71ca98882a78c93d':
Fixed warnings in libmtdutils
|
| | | |\ \ \ |
|
| | | | | |/
| | | |/|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
A few signed/unsigned comparison warnings were all that stood in the way
of a clean clang build.
Change-Id: Id8c47fcfa500a6ac164bddb855831cdc17d99847
Author: Edwin Vane <edwin.vane@intel.com>
Reviewed-by: Tareq A Siraj <tareq.a.siraj@intel.com>
|
| |\| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '8876725f05518e8170aedb81ab40dfe638eb656f':
Fix multiple defined symbol errors
|
| | |\| | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '0254d57367432069256b623c6852da8b92626e79':
Fix multiple defined symbol errors
|
| | | |\ \ \ |
|
| | | | |/ /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Use of __inline__ by projects in bootable/* was causing problems with
clang. Following the BKM and replaced use of __inline__ with
__attribute((__gnu_inline)).
Change-Id: If4ccfded685bb2c9d9c23c9b92ee052208399ef0
Author: Edwin Vane <edwin.vane@intel.com>
Reviewed-by: Kevin P Schoedel <kevin.p.schoedel@intel.com>
|
| |\| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '7b827d04a5cab7d8c5573181de3eb4ea2d0e173a':
Fixed unused param warnings for check-lost+found
|
| | |\| | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '481e03e39810ba1b7eab1d0d806039f45c4ad987':
Fixed unused param warnings for check-lost+found
|
| | | |\ \ \
| | | |/ /
| | |/| | |
|
| | | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
A few simple warnings fixed to produce a clean clang build.
Change-Id: I9484f860903a80e4c91e204e7e6738145535f642
Author: Edwin Vane <edwin.vane@intel.com>
Reviewed-by: Ariel J Bernal <ariel.j.bernal@intel.com>
|
| |\| | |
| | | |
| | | |
| | | |
| | | | |
* commit '4f33e55d1c38d2f72f3306a82c177850f3676408':
change recovery images to android with spinner
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Also make writing the locale a bit more robust.
Change-Id: I803dd0aa0b9d6661fad74ea13fb085682402323c
|
| |\| | |
| | | |
| | | |
| | | |
| | | | |
* commit '02ec6b88ed4e6cf40cc257572b07c7277b7b6341':
add simple text to recovery UI
|
| | | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
- recovery takes a --locale argument, which will be passed by the main
system
- the locale is saved in cache, in case the --locale argument is
missing (eg, when recovery is started from fastboot)
- we include images that have prerendered text for many locales
- we split the background states into four (installing update,
erasing, no command, error) so that appropriate text can be shown.
Change-Id: I731b8108e83d5ccc09a4aacfc1dbf7e86b397aaf
|
| |\| |
| | |
| | |
| | |
| | | |
* commit 'a3ccba6d314cb29b02d1dbda9a71427b11da936d':
add bonus data feature to imgdiff/imgpatch/applypatch
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The bonus data option lets you give an additional blob of uncompressed
data to be used when constructing a patch for chunk #1 of an image.
The same blob must be available at patch time, and can be passed to
the command-line applypatch tool (this feature is not accessible from
edify scripts).
This will be used to reduce the size of recovery-from-boot patches by
storing parts of the recovery ramdisk (the UI images) on the system
partition.
Change-Id: Iac1959cdf7f5e4582f8d434e83456e483b64c02c
|
| |\| |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* commit '5585025814418e8b692a3a38b7cff495180a74f8':
recovery: import init.recovery.${ro.hardware}.rc
Use the static version of libsparse
Multiple modules with the same name are going away.
host modules don't need LOCAL_MODULE_TAGS
|
| | |\|
| | |
| | |
| | |
| | |
| | |
| | | |
* commit '3733d2185bbcedd9ef626907f1f32628986cc0f5':
Use the static version of libsparse
Multiple modules with the same name are going away.
host modules don't need LOCAL_MODULE_TAGS
|
| | | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* changes:
Use the static version of libsparse
Multiple modules with the same name are going away.
host modules don't need LOCAL_MODULE_TAGS
|
| | | | |
| | | |
| | | |
| | | | |
Change-Id: I664f8dc7939f8f902e4775eaaf6476fcd4ab8ed2
|
| | | | |
| | | |
| | | |
| | | | |
Change-Id: I4154db066865d6031caa3c2c3b94064b2f28076e
|
| | | |/
| | |
| | |
| | | |
Change-Id: I5e1df90f18fbaf98e3207c553a8fb859c1064137
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Some devices need hardware specific services started in recovery, for
example watchdogd. Import init.recovery.${ro.hardware}.rc from the
recovery init.rc.
Bug: 6953625
Change-Id: I4a4cee210238150ffaabe774a44340ec3c8ff78c
|
| | | |
| | |
| | |
| | | |
Change-Id: I664f8dc7939f8f902e4775eaaf6476fcd4ab8ed2
|
| | | |
| | |
| | |
| | | |
Change-Id: I4154db066865d6031caa3c2c3b94064b2f28076e
|
| |/ /
| |
| |
| | |
Change-Id: I5e1df90f18fbaf98e3207c553a8fb859c1064137
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Full OTAs currently fail if the build contains a directory containing
only symlinks, because nothing creates that directory. Change the
symlink() command to create any ancestor directories that don't exist.
They're created as owner root perms 0700 because we assume that in
practice subsequent set_perm_recursive() calls will fix up their
ownership and permissions.
Change-Id: I4681cbc85863d9778e36b924f0532b2b3ef14310
|
| |\ \
| | |
| | |
| | | |
Change-Id: I2d8d18232ed02b2c4e3e661544046bf4b8039800
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
yres_virtual value is set incorrectly, causing serveral images to be skipped.
Change this value according to the number of buffers to fix this issue.
from: codeaurora.org
minui: Display the battery charging image correctly
commit: 581a4dead6b96579a13ff22e2454c1f329731679
Change-Id: I10f5d1c6cc37705f0287c7dd517082de2e11d264
Signed-off-by: Iliyan Malchev <malchev@google.com>
|
| | | |
| | |
| | |
| | | |
Change-Id: I9849c69777d513bb12926c8c622d1c12d2da568a
|
| |\ \ \
| | |/
| |/|
| | |
| | | |
* commit 'dd6cd4fcc1b22df7f55e1ab3e54589939dc54179':
graphics: add support for "single buffering"
|
| | |\ \ |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When we don't have enough video memory for double buffering we
fallback to "single buffering".
Change-Id: I8bfab6d8cd6b54f0cc6c67edc41a4c37d8fbd4ba
Signed-off-by: Octavian Purdila <octavian.purdila@intel.com>
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
|
| |\| | |
| | | |
| | | |
| | | |
| | | | |
* commit '989a28599a600b649f71a06335bf1e4085b5505a':
Link against libsparse
|
| | |\ \ \
| | |/ /
| |/| | |
|
| | |/ /
| | |
| | |
| | |
| | |
| | | |
libext4_utils requires libsparse, link against it as well.
Change-Id: I4d6aec0e5edcf1ed42118b7b77adcded2858d3dd
|
| | | |
| | |
| | |
| | | |
Change-Id: I0bf22c87c51a34ee4a839c4966277fad8150bd59
|
| |/ /
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When creating a new file using open(..., O_CREAT), it is an error
to fail to specify a creation mode. If a mode is not specified, a
random stack provided value is used as the "mode".
This will become a compile error in a future Android change.
Change-Id: I73c1e1a39ca36bf01704b07302af4971d234b5a8
|
| |\ \
| | |
| | |
| | |
| | | |
* commit '6d60667de6b8e6bd8a54fb4031901e2935743308':
Use a dependency file to replace the list file.
|
| | |\ \ |
|
| | |/ /
| | |
| | |
| | |
| | |
| | | |
instead of creating the list file whenever loading the Android.mk
Change-Id: I78e4820754399dff3993a863eede8b75da9f6d29
|
| | | | | |
| | \ \ | |
| |\ \| |
| |_|/
|/| |
| | | |
Change-Id: I66ce5e9ca22d4aecb694bf8814fbf3404fb0013b
|
| |/| | |
|
| | |\ \ |
|
| | | |\ \ |
|
| | | | |\ \ |
|
| | | | | |\ \ |
|
| | | | | | |\ \ |
|
| | | | | | | |\ \ |
|
| | | | | | | | |\ \ |
|
| |/ / / / / / / / /
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
They're completely broken and have been for months because this code
makes no sense.
Change-Id: Ibabcd3dbe5a004a45b341e4a5215aa3df77e1861
|
| |\ \ \ \ \ \ \ \ \
| |/ / / / / / / /
|/| | | | | | | |
| | | | | | | | |
| | | | | | | | | |
* commit 'e5d5ac76cc8e5d11867aeff6a1d068215c1c3a7c':
minor recovery changes
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
- add the --just_exit option to make recovery exit normally without doing anything
- make it possible to build updater extensions in C++
- add the clear_display command so that the updater binary can request
recovery switch to the NONE background UI
These are all used to support the notion of using OTA as a factory
reflash mechanism.
Change-Id: Ib00d1cbf540feff38f52a61a2cf198915b48488c
|
| |\ \ \ \ \ \ \ \ \ |
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
1. AOSP_APACH2
2. BSD for bsdiff.c and bspatch.c
Bug: 6299628
Change-Id: If9a5f7f8f07ad51bb62202253da189d804674e54
Signed-off-by: Wei Zhong <wzhong@google.com>
(cherry picked from commit 592e7a9cf1c856bee2adb8f285ac359e2d7f68e1)
|
| | |_|/ / / / / / /
|/| | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
The contribution of SELinux things to AOSP had a call to the old
ui_print that merged cleanly. This changes that call into the newer
call so it will actually compile when enabled.
Change-Id: I8368e937219b01d0bef06007fa46302415256d07
|
| |\ \ \ \ \ \ \ \ \
| |/ / / / / / / /
|/| | | | | | | |
| | | | | | | | |
| | | | | | | | | |
* commit '78911bdf4f9dfff6583f3f8150a3257212ceea13':
Change the format command to always take the mount point as an argument.
|
| | |\ \ \ \ \ \ \ \
| | | |_|_|_|_|_|/
| | |/| | | | | |
| | | | | | | | |
| | | | | | | | | |
* commit '2a4ab824b39e429969199c189ae1b6c1115e51d5':
Change the format command to always take the mount point as an argument.
|
| | | |\ \ \ \ \ \ \ |
|
| | | |/ / / / / / /
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Requires I5a63fd61a7e74d386d0803946d06bcf2fa8a857e
Change-Id: Ica5fb73d6f2ffb981b74d1896538988dbc4d9b24
|
| |\ \ \ \ \ \ \ \ \
| | |_|/ / / / / /
| |/| | / / / / /
| |_|_|/ / / / /
|/| | | | | | | |
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Make minadbd drop its root privileges after initializing. We need to
make the /tmp directory writable by the shell group so that it can
drop the sideloaded file there.
|
| |\ \ \ \ \ \ \ \
| | |/ / / / / /
| |/| | / / / /
| |_|_|/ / / /
|/| | | | | | |
Change-Id: I2e8298ff5988a96754f56f80a5186c9605ad9928
|
| | |\ \ \ \ \ \
| | | |/ / / /
| | |/| | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* commit '155cd3c155004433215147437cdf71844c9efd87':
Extend recovery and updater to support setting file security contexts.
Add libselinux to LOCAL_STATIC_LIBRARIES wherever libext4_utils is used.
|
| | | |\ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* changes:
Extend recovery and updater to support setting file security contexts.
Add libselinux to LOCAL_STATIC_LIBRARIES wherever libext4_utils is used.
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Extend minzip, recovery, and updater to set the security context on
files based on the file_contexts configuration included in the package.
Change-Id: Ied379f266a16c64f2b4dca15dc39b98fcce16f29
|
| | | |/ / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
libext4_utils now calls libselinux in order to determine the
file security context to set on files when creating ext4 images.
Change-Id: I09fb9d563d22ee106bf100eacd4cd9c6300b1152
|
| |\ \ \ \ \ \ \ |
|
| | | |_|_|_|_|/
| |/| | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
It's surprising if these fail, so abort the whole edify script to
catch any problems early.
Bug: 2284848
Change-Id: Ia2a0b60e7f086fc590b242616028905a229c9e05
|
| |\ \ \ \ \ \ \
| | |_|_|/ / /
| |/| | | / /
| |_|_|_|/ /
|/| | | | | |
|
| | |\ \ \ \ \ |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Change-Id: Id182bb95ffcc475c5acabb29b413e422302ae7f2
|
| | |/ / / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Rather than depending on the existence of some place to store a file
that is accessible to users on an an unbootable device (eg, a physical
sdcard, external USB drive, etc.), add support for sideloading
packages sent to the device with adb.
This change adds a "minimal adbd" which supports nothing but receiving
a package over adb (with the "adb sideload" command) and storing it to
a fixed filename in the /tmp ramdisk, from where it can be verified
and sideloaded in the usual way. This should be leave available even
on locked user-build devices.
The user can select "apply package from ADB" from the recovery menu,
which starts minimal-adb mode (shutting down any real adbd that may be
running). Once minimal-adb has received a package it exits
(restarting real adbd if appropriate) and then verification and
installation of the received package proceeds.
always initialize usb product, vendor, etc. for adb in recovery
Set these values even on non-debuggable builds, so that the mini-adb
now in recovery can work.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Needs to link with libminui and ui.cpp now.
Change-Id: I5005e12cf8adb13d320921e3f9174e8c7304d7bf
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Move the key for handling keys from ScreenRecoveryUI to RecoveryUI, so
it can be used by devices without screens. Remove the UIParameters
struct and replace it with some new member variables in
ScreenRecoveryUI.
Change-Id: I4c0e659edcbedc0b9e86ed261ae4dbb3c6097414
|
| | |\ \ \ \ \ |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Change-Id: Iddbb6f0aefdcbd131457690fddeddb0a873ea856
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Replace the device-specific functions with a class. Move some of the
key handling (for log visibility toggling and rebooting) into the UI
class. Fix up the key handling so there is less crosstalk between the
immediate keys and the queued keys (an increasing annoyance on
button-limited devices).
Change-Id: I8bdea6505da7974631bf3d9ac3ee308f8c0f76e1
|
| | |/ / / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Move all the functions in ui.c to be members of a ScreenRecoveryUI
class, which is a subclass of an abstract RecoveryUI class. Recovery
then creates a global singleton instance of this class and then invoke
the methods to drive the UI. We use this to allow substitution of a
different RecoveryUI implementation for devices with radically
different form factors (eg, that don't have a screen).
Change-Id: I7fd8b2949d0db5a3f47c52978bca183966c86f33
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Change-Id: I68a67a4c8edec9a74463b3d4766005ce27b51316
|
| | |/ / / /
|/| | | |
| | | | |
| | | | | |
Change-Id: I2f192c67ef425a53a1dba65d3e0544c1d5a567bd
|
| | |_|_|/
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Make minadbd drop its root privileges after initializing. We need to
make the /tmp directory writable by the shell group so that it can
drop the sideloaded file there.
Change-Id: I67b292cf769383f0f67fb934e5a80d408a4c131d
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Removes the retouch_binaries and undo_retouch_binaries from updater;
newly generated OTA packages should not call them any more.
Note that applypatch retains the ability to unretouch a file as it
reads it. This will be needed as long as we want to support OTAs from
devices that were installed with retouching.
Change-Id: Ib3f6baeae90c84ba85983f626d821ab7e436ceb2
|
| | | | |
| | | |
| | | |
| | | | |
Change-Id: I44a75f5451af053778be299b23274ecce9b2db76
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The applypatch function is somewhat sloppy about freeing memory (since
it was originally a standalone binary). Fix some of that.
Change-Id: Ifd44d71ea189c0b5115493119fd57bc37533fd59
|
| |\ \ \ \
| | |/ /
| |/| |
| | | | |
* commit '62947db579fa7acc9ee01d71f3aeb30add3df260':
|
| | |\ \ \
| | |_|/
| |/| |
| | | | |
* commit '37d0f260a55cfbe2b275131b12b2b5b824955e51':
|
| | | |\ \
| | | |/
| | |/|
| | | | |
Change-Id: Id3629feac35e35922942a6d04e741e72b95fded4
|
| | | | |
| | | |
| | | |
| | | | |
Change-Id: I082995c338feaf5d11288300768624cd51b027a4
|
| | | | |
| | | |
| | | |
| | | | |
Change-Id: Id182bb95ffcc475c5acabb29b413e422302ae7f2
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Set these values even on non-debuggable builds, so that the mini-adb
now in recovery can work.
Change-Id: If4c915403e6f43bfe922aa347e350a8982443106
|
| |\ \ \ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Rather than depending on the existence of some place to store a file
that is accessible to users on an an unbootable device (eg, a physical
sdcard, external USB drive, etc.), add support for sideloading
packages sent to the device with adb.
This change adds a "minimal adbd" which supports nothing but receiving
a package over adb (with the "adb sideload" command) and storing it to
a fixed filename in the /tmp ramdisk, from where it can be verified
and sideloaded in the usual way. This should be leave available even
on locked user-build devices.
The user can select "apply package from ADB" from the recovery menu,
which starts minimal-adb mode (shutting down any real adbd that may be
running). Once minimal-adb has received a package it exits
(restarting real adbd if appropriate) and then verification and
installation of the received package proceeds.
Change-Id: I6fe13161ca064a98d06fa32104e1f432826582f5
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Change-Id: I9451b8350d33806097598fb9e575b28fd8b292ad
Signed-off-by: Dima Zavin <dima@android.com>
|
| |/ / / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
See https://android-git.corp.google.com/g/#/c/157220
Bug: 5449033
Change-Id: I9ef9f808a852c36903c8afc40136c89c9ec07630
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
See https://android-git.corp.google.com/g/157065
Bug: 5449033
Change-Id: If6c6ea354caf02fb3bf155931b23e4a6d2f751e9
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
See https://android-git.corp.google.com/g/156801
Bug: 5449033
Change-Id: I3b4ea2184555bc0b570ec858601d4c43ecffb6f8
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Some packages expect to find cache mounted, since it always is for
"real" OTAs.
Bug: 5739915
Change-Id: I7a7cdd88a60c61e4bc7dc3e1f99956f6487c42e1
|
| |\| | |
| | | |
| | | |
| | | | |
* commit '9fc3e3c8a6a5f2f82d5712805e90a9c89f914efa':
|
| | |\ \ \
| | |/ /
| |/| /
| | |/ |
Change-Id: I74a51ed7639683e0ab67c922b954eb1391dd2a49
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Move the key for handling keys from ScreenRecoveryUI to RecoveryUI, so
it can be used by devices without screens. Remove the UIParameters
struct and replace it with some new member variables in
ScreenRecoveryUI.
Change-Id: I70094ecbc4acbf76ce44d5b5ec2036c36bdc3414
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Replace the device-specific functions with a class. Move some of the
key handling (for log visibility toggling and rebooting) into the UI
class. Fix up the key handling so there is less crosstalk between the
immediate keys and the queued keys (an increasing annoyance on
button-limited devices).
Change-Id: I698f6fd21c67a1e55429312a0484b6c393cad46f
|
| | | |
| | |
| | |
| | | |
Change-Id: I61f249861b27180225fb786901275d2da611531b
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Move all the functions in ui.c to be members of a ScreenRecoveryUI
class, which is a subclass of an abstract RecoveryUI class. Recovery
then creates a global singleton instance of this class and then invoke
the methods to drive the UI. We use this to allow substitution of a
different RecoveryUI implementation for devices with radically
different form factors (eg, that don't have a screen).
Change-Id: I76bdd34eca506149f4cc07685df6a4890473f3d9
|
| |\ \ \
| | |/
| |/|
| | | |
Change-Id: I29287109bc555579a9c66b586a3636ba41be5c57
|
| | |\ \
| | |/
| |/| |
|
| | | |\ |
|
| | | | |\ |
|
| | | | | |\ |
|
| | | | | | |\ |
|
| | | | | | | |\ |
|
| | | | | | | | |\ |
|
| | | | | | | | | |\ |
|
| | | | | | | | | | |\ |
|
| | | | | | | | | | | |\ |
|
| | | | | | | | | | | | |\ |
|
| | | | | | | | | | | | | |\ |
|
| | | | | | | | | | | | | | |\ |
|
| | | | | | | | | | | | | | |/| |
|
| | | | | | | | | | | | | | | |\ |
|
| | | | | | | | | | | | | | | | |\ |
|
| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | |
Change-Id: I8444f44d3194ff16ce54121633d5b255231393f5
Signed-off-by: Mike Lockwood <lockwood@android.com>
|
| |/ / / / / / / / / / / / / / / /
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | |
Change-Id: I423a23581048d451d53eef46e5f5eac485b77555
|
| |/ / / / / / / / / / / / / / /
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | |
updater now has a function "wipe_cache();" which causes recovery to
wipe the cache partition after the successful installation of the
package. Move log copying around a bit so logs and the last_install
flag file are copied to cache after it's wiped.
Bug: 5314244
Change-Id: Id35a9eb6dcd626c8f3a3a0076074f462ed3d44bd
|
| |/ / / / / / / / / / / / / /
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | |
| | | | | | | | | | | | | | |
If a key is down prior to the time of initialization, we would not get the
down event for the key, and thus think that the key is not pressed.
Add an interface that allows one to provide a callback to execute
on all keys that are currently down.
Change-Id: I2a4096c0cb4c7c7a9a80d207835f168a0b418413
Signed-off-by: Dima Zavin <dima@android.com>
|
| |/ / / / / / / / / / / / /
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
Change-Id: Ifa0b59e43eaf0bea9435aa4d96c5b0fc4f10fbfe
|
| |/ / / / / / / / / / / /
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
Change-Id: I6d52fd1db27fdf1b61f41f598a2209b70385b106
|
| | | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
Change-Id: I8283d7aaa0f66d488f462cd108350cc49657a745
Signed-off-by: Dima Zavin <dima@android.com>
|
| | | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
Change-Id: Iad52a6f2adcae0068d252d6163586f9d7b93121d
Signed-off-by: Dima Zavin <dima@android.com>
|
| | | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
Events are now delivered through a callback mechanism during
a call to ev_dispatch(). This will allow us to extend the events
code to handle other devices/fds, not just input. One such example
is the ability to process uevents.
During initialization, we provide an input callback to ev_init
that gets called when a new event is encountered during dispatch.
ev_get has been removed and replaced with ev_get_input() helper
function that can be called from inside the callback to attempt
to get an input event.
The existing client of ev_get in recovery has been split up such
that the input thread just calls ev_wait(); ev_dispatch(); and
the input_callback handles individual events by using the
ev_get_input() helper.
Change-Id: I24d8e71bd1533876b4ab1ae751ba200fea43c049
Signed-off-by: Dima Zavin <dima@android.com>
|
| | | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
Change-Id: I5c3ee61cbf6fadae50f10b9f2e73caceaa5048a7
Signed-off-by: Dima Zavin <dima@android.com>
|
| |/ / / / / / / / / / /
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Change-Id: I5e8f477b7b205794f2975f12e6b6010c177f6052
Signed-off-by: Dima Zavin <dima@android.com>
|
| |/ / / / / / / / / /
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Change-Id: I912d3ab32973c5c5e7b6b1749698f8a71d884fa3
|
| |/ / / / / / / / /
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Change-Id: I787c086223b674050c0a12fc575add9badb471af
|
| |\ \ \ \ \ \ \ \ \
| |/ / / / / / / /
|/| | | | | | | | |
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Change-Id: Ie7563bf8fb2d627454010de7388d0992e2accf91
|
| |\ \ \ \ \ \ \ \ \ |
|
| | | |/ / / / / / /
| |/| | | | | | |
| | | | | | | | |
| | | | | | | | | |
Change-Id: Iabe8be5bbfa7d2bf1d13280c8734ff75b62a152f
|
| |/ / / / / / / /
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Bug: 5010576
Change-Id: Ib465fdb42c8621899bea15c04a427d7ab1641a8c
|
| | |/ / / / / /
|/| | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Wrote some missing items in recovery, most notably the serial number so that it shows up correctly on adb.
Change-Id: If430c0b78191c8d77f781aa605b5081571451775
|
| | |/ / / / /
|/| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Always start adbd if ro.debuggable=1 rather than basing it on user preference
in persistent system properties.
Use new D001 product ID, which I just allocated for "android recovery mode"
Change-Id: I6f1eac5257eaad2e538c0a8dd549ad89219efa3e
Signed-off-by: Mike Lockwood <lockwood@android.com>
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Change-Id: I8f78377555c658a992ca95cadf11b67ddc93fed8
|
| | |/ / / /
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Set the BPP and other fields and write it back, so the line_length comes back correctly.
Change-Id: I85e4e8223c79b9394ae1fb609b3026de62027ab8
|
| | |/ / /
|/| | |
| | | |
| | | |
| | | |
| | | | |
recovery's init.rc was missing lines that made adb root work.
Change-Id: I300e6997e3b5cb9c7b542b2012eed61deb2550f1
|
| | |/ /
|/| |
| | |
| | | |
Change-Id: Ifee94ac08028e62a40241a089ac7c36346fea3a3
|
| | |/
|/|
| |
| |
| | |
Change-Id: I8444f44d3194ff16ce54121633d5b255231393f5
Signed-off-by: Mike Lockwood <lockwood@android.com>
|
| |\ \
| | |
| | |
| | | |
* commit 'f84b25243d7ebeaca8424171f5ca3b192cc76d80':
|
| | |\ \
| | | |
| | | |
| | | | |
* commit '6ebedf0053ccefd414e5887db316f84bd8f6c44c':
|
| | | |\ \
| | | | |
| | | | |
| | | | | |
* commit '82da01d6a32c4fbfe57155c119d4669d7faba438':
|
| | | | |\ \
| | | | | |
| | | | | |
| | | | | | |
Change-Id: I30902cdb19698f88a1ea57cf8c7667ef867d13a8
|
| |\| | | | |
| |_|_|_|/
|/| | | |
| | | | |
| | | | | |
* commit 'a94d954862fab26f6159ed7bb836ba6758a569fd':
Mute unharmful build warning at the top of the build log:
|
| | |\| | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '1117c69fe40dccfa6090d184094c4a6d407ab8d6':
Mute unharmful build warning at the top of the build log:
|
| | | |\ \ \
| | | |/ /
| | |/| /
| | | |/
| | | | |
* commit '7172eb7b623f4b30f5a709d639fcd3fb51cd6220':
Mute unharmful build warning at the top of the build log:
|
| | | | |\ |
|
| | | | |/
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
diff: out/target/product/generic/obj/PACKAGING/updater_extensions_intermediates/register.inc.list:
No such file or directory
Change-Id: I269b1703b6091b343db45b1c5cdd0962c738788b
|
| |\ \ \ \
| | | | |
| | | | |
| | | | | |
Change-Id: I1205ca405fdaf586ebc349fbe83969e9694fab60
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Don't hardcode magical partition behavior in roots.c.
Change-Id: I587fc2c066575b51c11efd2e45a50f5b864df484
|
| |\ \ \ \ \
| | |/ / /
| |/| | |
| | | | |
| | | | | |
* commit 'c2a158db9588e6ad290dd0f9171a190609900387':
delay accessing misc partition until its device exists
|
| | |\ \ \ \ |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
When the misc partition is on an emmc device, recovery can get started
and try to access it before the kernel has actually created the
device. Try statting the device before reading or writing it; delay
up to 10 seconds waiting for the device to exist.
Change-Id: I988442d5701394d7152bfab3c571e7548c364f61
|
| |\| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* commit '90588820b7110acf142d17457f0d10cd7cb57a8a':
delay accessing misc partition until its device exists
|
| | |/ / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
When the misc partition is on an emmc device, recovery can get started
and try to access it before the kernel has actually created the
device. Try statting the device before reading or writing it; delay
up to 10 seconds waiting for the device to exist.
Change-Id: I93256db4b047c76020490e8a3dc76b8ade643291
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
When the misc partition is on an emmc device, recovery can get started
and try to access it before the kernel has actually created the
device. Try statting the device before reading or writing it; delay
up to 10 seconds waiting for the device to exist.
Change-Id: Ib9bf6c35fa2c28fc43aa7550aaaffb76c9f6e120
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
write_raw_image() can now take either a blob or a filename as the
source. The blob format eliminates the need for a temp file.
Change-Id: I0c6effec53d47862040efcec75e64b7c951cdcf7
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
When installing a package, create /cache/recovery/last_install, which
contains the filename of the package and a 1 or 0 for success or
failure.
Also, don't mount ext4 and vfat filesystems as read-only (on devices
where /cache is ext4, we need it to be read-write).
Change-Id: I0cf2a1921bbd65e06343aa74e2006577fac77c2c
|
| |\| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '4762633cf846d17516878303502b056b52353a5d':
log which key a package verified against in recovery
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Change-Id: I0d91b715d1eb9e45e2fce54bb93ba0abef92727e
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Change-Id: Ieffafe00cf82620057cacd0629cb60b0e6aad817
Signed-off-by: Iliyan Malchev <malchev@google.com>
|
| |\| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '6e4472abbd3c7be9cd31d98a03df1e3b6fa92f40':
Have recovery reboot using the new android_reboot() function.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The new android_reboot() function is a nicer way to reboot the
system. I can optionally sync() and remount read-only writable
filesystems. This fixes bug 3350709.
Change-Id: Ic4c8676debd642e57bce3107b99dd810d90b6f82
|
| |\| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '6ce4a326efae4abb108e19899f4d7776abc362da':
don't reboot for inactivity if USB is connected
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
(Cherry-pick back from master.)
Bug: 4071007
Change-Id: I28355c593770df678968185171bdd19dabe7f062
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Change-Id: Icba35da91167d30c446581afb47d0804e49964bf
|
| |\| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '68189f2994690538b6e3bddc3788cb092cbda088':
allow paletted RGB images in recovery
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Recovery assumes any paletted images are in RGBA format. Make it
handle both RGB and RGBA paletted images.
Bug: 3514884
Change-Id: I517cd571aa3f434dacacc33a774236260aec20ef
|
| |\ \ \ \ \
| |/ / / /
|/| | | | |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Cuts the byte size of the recovery images in half, roughly.
Change-Id: I453a499e9937163c545dab3c552201882766e218
|
| |/ / / /
| | | |
| | | |
| | | |
| | | |
| | | | |
Cuts the byte size of the recovery images in half, roughly.
Change-Id: I3c45b5e58423b57faca83fc67b4e24e8d643c5b1
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Also remove the weird backwards compatibility thing for animations
with fewer than 10 frames. Frames are always named "name01.png",
"name02.png", ..., no matter how many there are.
Change-Id: I7af64fdec1bfcdb0464998b735ec8d6c626ffe9d
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Change some of the UI parameters (# of indeterminate progress bar
frames, fps, etc.) from #defined constants to variables that can be
set by the device-specific recovery_ui code (via a new function).
Support overlaying different images on top of the base installation
icon to animate it. Make the FPS control more accurate.
Change-Id: I9268b389b7ea6b3ed9e0c7eae37baf4272e60edd
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '8d43d94065e88e00e1460841b43c7de584ee5585':
store partition length in recovery.fstab
|
| | |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* commit '2c273f004e0504ae0389ad160ed2a92624873189':
store partition length in recovery.fstab
|
| | | |/ / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Don't hardcode magical partition behavior in roots.c.
Change-Id: I587fc2c066575b51c11efd2e45a50f5b864df484
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Don't hardcode magical partition behavior in roots.c.
Change-Id: I587fc2c066575b51c11efd2e45a50f5b864df484
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Change-Id: Iada6268b0a72ee832113ea397334cc7950a37051
|
| |\| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '5df22d03d2e7c6de213d83a58e0af39c42f839ca':
make recovery reboot after 2 minutes of no activity
|
| | |\| | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '5cae445e43c5928daba0a76745b0dd2657274eda':
make recovery reboot after 2 minutes of no activity
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
If recovery sits for 2 minutes in prompt_and_wait(), and you've never
turned the screen on via the magic keypress, go ahead and reboot. (We
used to assume that the user could pull the battery to get out of this
state, but on devices with nonremovable batteries...)
If you've ever enabled display of the log/menu since recovery started,
we assume you know what you're doing and will stay in recovery until
you choose to reboot.
Bug: 3387873
Bug: 3387274
Change-Id: I041621e5db132df9a925e6808845a7c45e1b427a
|
| |\| | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* commit 'da993fcf2665102435b05d6b20a4c4e8f8bd3b8f':
Free allocated struct after freeing field
|
| | |\ \ \ \
| | |/ / /
| |/| / /
| | |/ /
| | | | |
* commit '8d58c957036835db148acc4e506633a016dc6c7e':
Free allocated struct after freeing field
|
| | | |\ \ |
|
| | | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Free allocated MtdReadContext after freeing buffer field in struct,
not before.
Change-Id: I237920dc36115389cd2d6948e7a962dbec22fe56
|
| |\ \ \ \
| |/ / /
|/| | | |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This was never used; encrypted filesystems are being done a different
way now.
Change-Id: I519c57b9be44d001f0b81516af7bfc252069892b
|
| |/ / /
| | |
| | |
| | |
| | |
| | |
| | | |
When formatting /data, if it's an ext4 filesystem, reserve the
last 16 Kbytes for the crypto footer.
Change-Id: I7b401d851ee87732e5da5860df0287a1c331c5b7
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
Add "RECOVERY_24_BIT := true" to the device's BoardConfig.mk to use
24-bit framebuffers in the recovery ui.
Change-Id: Iaede138bf7870becf237f12f1c0e49c9ff82d007
|
| | | |
| | |
| | |
| | | |
Change-Id: I835e55fb80add6a74cd4d99f77b2528829d9a349
|
| | | |
| | |
| | |
| | | |
Change-Id: Id96e98da76b3091987b01651f980797b1d6b49d8
|
| |\| |
| | |
| | |
| | |
| | | |
* commit 'c5ebf1fba2f870a4e9453721112900975c18e083':
fix comparison of ECC stats before and after mtd reads
|
| | |\|
| | |
| | |
| | |
| | | |
* commit '5d6309e77f6055a9aec062dd991d071054726ebb':
fix comparison of ECC stats before and after mtd reads
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
ECC errors are found by comparing the result of ioctl(ECCGETSTATS)
before and after the read. But if an error was found causing us to go
to the next block, we'd compare the stats before the *first* read to
the stats after the second (third, fourth, etc.) reads, so we'd read
to the end of the partition without ever succeeding. Fix logic so we
compare the values before and after each read independently.
Bug: 3162777
Change-Id: I5a13abd7243d2afd1d21bd98cbb233e5124b2e80
|
| |\| |
| | |
| | |
| | |
| | | |
* commit '8521ef5965675da85c7bbbe9c8b86fe68716e855':
clear recovery framebuffers on allocation; display icon right after ui_init
|
| | |\|
| | |
| | |
| | |
| | | |
* commit '51266d1397309978eac9b2e96035582454f0321b':
clear recovery framebuffers on allocation; display icon right after ui_init
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Make ui_init() clear the framebuffer memory it maps in so the user
isn't treated to a visible flash of random bits on recovery startup.
Call ui_set_background() (to show the installing icon) right after
ui_init() to display something while device_recovery_start() is
working (which can take a second or two on some devices).
Bug: 3145331
Change-Id: I11e7859fab5847370ea4f4932c3fb1558af26c5d
|
| |\| |
| | |
| | |
| | |
| | |
| | |
| | | |
Merge commit '2d87023e77b20aa2196c8ceae833b33040b0dc57'
* commit '2d87023e77b20aa2196c8ceae833b33040b0dc57':
save the log from recovery's last run in /cache/recovery/last_log
|
| | |\|
| | |
| | |
| | |
| | |
| | |
| | | |
Merge commit '2c3539e4d8251ad91e0b881253d39583680093e8' into gingerbread-plus-aosp
* commit '2c3539e4d8251ad91e0b881253d39583680093e8':
save the log from recovery's last run in /cache/recovery/last_log
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
Also, don't lose the start of the log whenever a wipe cache is
performed.
Change-Id: I29999762854eb36d1ff2bc20b4183c9077b19777
|
| |\| |
| | |
| | |
| | |
| | |
| | |
| | | |
Merge commit '704fa75024467fb4e362537f7c341eb056e283b5'
* commit '704fa75024467fb4e362537f7c341eb056e283b5':
handle old-style CACHE: packages
|
| | |\|
| | |
| | |
| | |
| | |
| | |
| | | |
Merge commit '9b125b04c6ba8f07d8aa6494d58917a596443dc5' into gingerbread-plus-aosp
* commit '9b125b04c6ba8f07d8aa6494d58917a596443dc5':
handle old-style CACHE: packages
|
| | | |
| | |
| | |
| | | |
Change-Id: I7bf52b56770c207ba1c8329243991b07ebb65779
|
| |\| |
| | |
| | |
| | |
| | |
| | |
| | | |
Merge commit 'af78591c9a2aa8379c2d8528c31ea1eb813f6cae'
* commit 'af78591c9a2aa8379c2d8528c31ea1eb813f6cae':
mount sdcard only on demand; fix sideload installs
|
| | |\|
| | |
| | |
| | |
| | |
| | |
| | | |
Merge commit '2c3c5c15d15faf1c9fa074851c57d0afa2a40d28' into gingerbread-plus-aosp
* commit '2c3c5c15d15faf1c9fa074851c57d0afa2a40d28':
mount sdcard only on demand; fix sideload installs
|
| | | |\ |
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Bug: 3009493
Change-Id: I1a7f99fc41a6a7012742e82f8c06a0c75584890a
|
| |\| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Merge commit '8147ba850b2e74dc950183e67c77a0da2b1a19b7'
* commit '8147ba850b2e74dc950183e67c77a0da2b1a19b7':
use fs_type "emmc" instead of "block" for consistency (do not merge)
|
| | |\| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Merge commit '93ca4fc6943a3ebf758c5db98531531b8fe92c98' into gingerbread-plus-aosp
* commit '93ca4fc6943a3ebf758c5db98531531b8fe92c98':
use fs_type "emmc" instead of "block" for consistency (do not merge)
|
| | | |/
| | |
| | |
| | | |
Change-Id: Iab60665d9c6daef7893896a64b7f319120a5f8ee
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Remove the wacky notion of "roots" and "root paths" (those things that
look like "FOO:some/path" instead of just "/foo/some/path"). Let each
device specify its own table of available partitions and how to mount
them (needed for devices that use both MTD/yaffs2 and EMMC/ext4
partitions).
(Cherrypicked from gingerbread w/slight edits.)
Change-Id: I2479ce76b13e73f1d12035c89386c3a82b3edf51
|
| |\| |
| | |
| | |
| | |
| | |
| | |
| | | |
Merge commit '3dba40da1e533c6f419857e4274d9d9dd55868b6'
* commit '3dba40da1e533c6f419857e4274d9d9dd55868b6':
remove the notion of "root path"; support mixed flash types (do not merge)
|
| | |\|
| | |
| | |
| | |
| | |
| | |
| | | |
Merge commit 'd4208f9f9d4e9f268ba1888c1fe879ee73eb7e47' into gingerbread-plus-aosp
* commit 'd4208f9f9d4e9f268ba1888c1fe879ee73eb7e47':
remove the notion of "root path"; support mixed flash types (do not merge)
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Remove the wacky notion of "roots" and "root paths" (those things that
look like "FOO:some/path" instead of just "/foo/some/path"). Let each
device specify its own table of available partitions and how to mount
them (needed for devices that use both MTD/yaffs2 and EMMC/ext4
partitions).
Change-Id: I18b0a572a71c5e087e0b7ae11b1774388339bfd1
|
| |\| |
| | |
| | |
| | | |
Change-Id: If14ab094a8bb11106b0ea7fdf8736e5e4c223089
|
| | |\|
| | |
| | |
| | |
| | |
| | |
| | | |
Merge commit 'd7d4208976125d114d0b8e44438e2417d5275098' into gingerbread-plus-aosp
* commit 'd7d4208976125d114d0b8e44438e2417d5275098':
remove unneeded partition roots
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Recovery itself no longer needs to access all these partitions;
manipulation of them is done by the updater binary. This is a small
first step towards removing roots entirely.
Change-Id: I3fbcada32079a37db4cc097861dfa91e0a08da30
|
| |\| |
| | |
| | |
| | |
| | |
| | |
| | | |
Merge commit '1dcd2fd0c7cc44cae279a5088241bdf15f084cb8'
* commit '1dcd2fd0c7cc44cae279a5088241bdf15f084cb8':
do not merge - update to match ext4utils api
|
| | |\|
| | |
| | |
| | |
| | |
| | |
| | | |
Merge commit '792b00712bb1411d3b0583bcea95b43b3107fb95' into gingerbread-plus-aosp
* commit '792b00712bb1411d3b0583bcea95b43b3107fb95':
do not merge - update to match ext4utils api
|
| | | |
| | |
| | |
| | | |
Change-Id: I9d34e491022d7dfed653a861b0728a0a656f1fbe
|
| | | |
| | |
| | |
| | | |
Change-Id: Ie6e309b127e80cd6475f1deaa5dbadf9f5cc2746
|
| |\| |
| | |
| | |
| | | |
Change-Id: Iab4f25702a5a62b9172f81fd543a8240a0e603c3
|
| | |\|
| | |
| | |
| | |
| | |
| | |
| | | |
Merge commit '8a8e6cc33cc0dcfe7e184b59d5ef1f1c29095509' into gingerbread-plus-aosp
* commit '8a8e6cc33cc0dcfe7e184b59d5ef1f1c29095509':
(cherry-pick) EMMC support in applypatch
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Let applypatch read and write EMMC partitions as well as MTD ones.
This enables incremental updates that include boot image changes, as
well as OTA of new recovery partitions.
Change-Id: Ib1861219c7ca66dff29ad02d6a0a14e5f03eb4d8
|
| |\| |
| | |
| | |
| | | |
Change-Id: Id458df96fd56830fdb35397e95a80274761ecff5
|
| | |\|
| | |
| | |
| | |
| | |
| | |
| | | |
Merge commit '56c5105bd7096704eaed35329b2c8c84cc282867' into gingerbread-plus-aosp
* commit '56c5105bd7096704eaed35329b2c8c84cc282867':
support for ext4/EMMC filesystems in updater binary
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Make the mount and format functions take extra parameters describing
the filesystem type and add support for mounting and formatting ext4
filesystems on EMMC.
Change recovery to consistently use stdout for status messages instead
of mixing stdout and stderr.
|
| |\| |
| | |
| | |
| | | |
Change-Id: I658894dcaddbf0de428e3c51dbcdc306d3f47a52
|
| | |\|
| | |
| | |
| | |
| | |
| | |
| | | |
Merge commit '8674a726ff05a4a6c09c6934778c251635f130a8' into gingerbread-plus-aosp
* commit '8674a726ff05a4a6c09c6934778c251635f130a8':
(cherry-pick) support installing any .zip file on the sdcard
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Replaces the "install sdcard:update zip" menu option with one that
displays a menu of zip files (and subdirs) on the sdcard and lets you
pick which one to install.
Change-Id: Icff541525f2fdfc8939a91af626ecc386ac9dd07
|
| |\| |
| | |
| | |
| | |
| | |
| | |
| | | |
Merge commit '858f0a763d0f736eb721f54257b6164886bfcbfc'
* commit '858f0a763d0f736eb721f54257b6164886bfcbfc':
close update package before installing; allow remount
|
| | |\|
| | |
| | |
| | |
| | |
| | |
| | | |
Merge commit '8e5e4dada713609c9b2c45ea9cf4572bb89ef761' into gingerbread-plus-aosp
* commit '8e5e4dada713609c9b2c45ea9cf4572bb89ef761':
close update package before installing; allow remount
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Close the update package before invoking the binary, to allow the
installer to unmount /cache if it wants to. Add a function to allow
remounting of a mount as read-only.
Change-Id: Idfcc96c3da66083295177f729263560be58034e4
|
| |\| |
| | |
| | |
| | |
| | |
| | |
| | | |
Merge commit 'bd4bc088e286b87a5d1469598644125ecc0fd547'
* commit 'bd4bc088e286b87a5d1469598644125ecc0fd547':
add the ability to seek to a raw location while reading MTD partition
|
| | |\|
| | |
| | |
| | |
| | |
| | |
| | | |
Merge commit 'd12560aa2134d3af21a1220cd4873553f9c51743' into gingerbread-plus-aosp
* commit 'd12560aa2134d3af21a1220cd4873553f9c51743':
add the ability to seek to a raw location while reading MTD partition
|
| | | |
| | |
| | |
| | | |
Change-Id: Id1563ca667c50e61cf1bb15d2cf783a50937eece
|
| |\| |
| | |
| | |
| | |
| | |
| | |
| | | |
Merge commit 'f94a3575d76f1fd6df20f82ca28fff688d53cfbc'
* commit 'f94a3575d76f1fd6df20f82ca28fff688d53cfbc':
stop treating all-zero blocks as bad
|
| | |\|
| | |
| | |
| | |
| | |
| | |
| | | |
Merge commit '61ba7a83ef46494689801ddaad569d7d174153b1' into gingerbread-plus-aosp
* commit '61ba7a83ef46494689801ddaad569d7d174153b1':
stop treating all-zero blocks as bad
|
| | | |
| | |
| | |
| | | |
Change-Id: If49fa6485f66598d16a7e44fce3129de55fab422
|
| |\| |
| | |
| | |
| | |
| | |
| | |
| | | |
Merge commit 'a2c9a1e8a2b99bd8197c83b2f749ec61bc0312f8'
* commit 'a2c9a1e8a2b99bd8197c83b2f749ec61bc0312f8':
block is bad if ioctl() returns nonzero
|
| | |\|
| | |
| | |
| | |
| | |
| | |
| | | |
Merge commit 'aaf3f56c44c37dca4ef9cc9efde68727ca26105f' into gingerbread-plus-aosp
* commit 'aaf3f56c44c37dca4ef9cc9efde68727ca26105f':
block is bad if ioctl() returns nonzero
|
| | | |
| | |
| | |
| | | |
Change-Id: I6fc4ce796bc663d05035927c0af0ce7ab6d07218
|
| |\| |
| | |
| | |
| | |
| | |
| | |
| | | |
Merge commit '28cae98c834fb4bc47588b34dc3fe19811d5162b'
* commit '28cae98c834fb4bc47588b34dc3fe19811d5162b':
add --show_text option to recovery
|
| | |\|
| | |
| | |
| | |
| | |
| | |
| | | |
Merge commit '4bc980626c1cf6f1ea7d36e4b54e0023c896c9de' into gingerbread-plus-aosp
* commit '4bc980626c1cf6f1ea7d36e4b54e0023c896c9de':
add --show_text option to recovery
|
| | | |
| | |
| | |
| | | |
Change-Id: Ie6c6c920260dfa759fbb15b1f352d6bb0fa7146c
|
| |\| |
| | |
| | |
| | |
| | |
| | |
| | | |
Merge commit '4c7c2f73af773872faf5a65167d74900865d96ba'
* commit '4c7c2f73af773872faf5a65167d74900865d96ba':
Revert 21f0f97ebabb47adcbfe8d38b02685f2019b4eb3
|
| | |\|
| | |
| | |
| | |
| | |
| | |
| | | |
Merge commit '532c86002bb89db43094b27ec50f001ae173c650' into gingerbread-plus-aosp
* commit '532c86002bb89db43094b27ec50f001ae173c650':
Revert 21f0f97ebabb47adcbfe8d38b02685f2019b4eb3
|
| | | |
| | |
| | |
| | | |
Change-Id: I46e4d7fe76e4219207e46f19e50188e38bb932b7
|
| |\| |
| | |
| | |
| | |
| | |
| | |
| | | |
Merge commit '17b44ee3d82d7b8efa8dc3bc17d78fee11d72e01'
* commit '17b44ee3d82d7b8efa8dc3bc17d78fee11d72e01':
Fix for crespo.
|
| | |\|
| | |
| | |
| | |
| | |
| | |
| | | |
Merge commit '21f0f97ebabb47adcbfe8d38b02685f2019b4eb3' into gingerbread-plus-aosp
* commit '21f0f97ebabb47adcbfe8d38b02685f2019b4eb3':
Fix for crespo.
|
| | | |
| | |
| | |
| | | |
Change-Id: I008510bf614606a46a630c7adc39464ce1143ec3
|
| |\| |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Merge commit '979002871ddc417dfdfb6a6542b9018626af7883'
* commit '979002871ddc417dfdfb6a6542b9018626af7883':
fix bug in applying patches
remove shadowed variable declaration
|
| | |\|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Merge commit '965f9dc45345486e885b59b4776f0ca5e765ec20' into gingerbread-plus-aosp
* commit '965f9dc45345486e885b59b4776f0ca5e765ec20':
fix bug in applying patches
remove shadowed variable declaration
|
| | | |\
| | | |
| | | |
| | | | |
Change-Id: I4d56dc0235f3df1306736c42144dccb26b876b74
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
An accidental variable declaration ("int enough_space = ..." instead
of "enough_space = " inside a block) shadowing the real one meant we
were always using the copy-to-cache path for patching, even when not
necessary. Remove it. Enforce an absolute minimum of free space as
well, to avoid running into problems patching small files, now that
the copy-to-cache path is (inadvertently) well-tested.
Change-Id: Idb7d57241a9adcda2e11001fa44f0cd67ce40d19
|
| |\| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Merge commit 'c080bc549aaf272c77fe7903e52c2a2c0d8de1bb'
* commit 'c080bc549aaf272c77fe7903e52c2a2c0d8de1bb':
remove shadowed variable declaration
|
| | |\| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Merge commit 'fbd7ae7a1ce0060221241ed02c576983c1f48d34' into gingerbread-plus-aosp
* commit 'fbd7ae7a1ce0060221241ed02c576983c1f48d34':
remove shadowed variable declaration
|
| | | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Merge commit '201cd46680f5789e21a57fb4476ab0ba0c0ed4c0' into gingerbread
* commit '201cd46680f5789e21a57fb4476ab0ba0c0ed4c0':
remove shadowed variable declaration
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
An accidental variable declaration ("int enough_space = ..." instead
of "enough_space = " inside a block) shadowing the real one meant we
were always using the copy-to-cache path for patching, even when not
necessary. Remove it. Enforce an absolute minimum of free space as
well, to avoid running into problems patching small files, now that
the copy-to-cache path is (inadvertently) well-tested.
Change-Id: Idb7d57241a9adcda2e11001fa44f0cd67ce40d19
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
An extra parameter was added to the make_ext4fs() function, we these tools need
to be updated to match.
Change-Id: Id640a7f2b03153eb333b00337f0f991ff5332349
|
| |\| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Merge commit 'c4e3200578ad670bee9f5a88e90e7a77089d5df7'
* commit 'c4e3200578ad670bee9f5a88e90e7a77089d5df7':
fix bug in applying patches
|
| | |\| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| | | | |
| | | |
| | | |
| | | | |
Change-Id: I9f912857cfc6afb8ba764f5541af7f01df029a77
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Separate files for retouch functionality are in minelf/*
ASLR for shared libraries is controlled by "-a" in ota_from_target_files.
Binary files are self-contained. Retouch logic can recover from crashes.
Signed-off-by: Hristo Bojinov <hristo@google.com>
Change-Id: I76c596abf4febd68c14f9d807ac62e8751e0b1bd
|
| | | | |
| | | |
| | | |
| | | | |
Change-Id: If0efeddc28e1dbb52d9e52abf53323e2cc97c8f0
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Allow sideloading of OTA packages from USB drives that appear as
/dev/block/sda1.
Change-Id: I1908576c24547cd0088475d8c8917699cd906868
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This CL removes the following line from the top of build logs:
"diff: out/target/product/*/obj/PACKAGING/updater_extensions_intermediates/register.inc.list: No such file or directory"
Change-Id: I79c15a69a0b1b0da0e45620b45a7a0fea5625250
|
| |\| | |
| | | |
| | | |
| | | | |
Change-Id: Iafb9cb4adf27a7086d587d95e94ab1bd050099dc
|
| | |\| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Let applypatch read and write EMMC partitions as well as MTD ones.
This enables incremental updates that include boot image changes, as
well as OTA of new recovery partitions.
Change-Id: I3766b9e77c639769ddf693b675da51d57f6e6b1d
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Make the mount and format functions take extra parameters describing
the filesystem type and add support for mounting and formatting ext4
filesystems on EMMC.
Change recovery to consistently use stdout for status messages instead
of mixing stdout and stderr.
|
| |\ \ \ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Change-Id: I827af624c9ec7c64decb702de8c0310cf19b4141
|
| |\ \ \ \ \
| |/ / / /
|/| / / /
| |/ / /
| | | |
| | | | |
Merge commit '60faafcf01ff7f4179cdcaefd24b10ac4ee7f692'
* commit '60faafcf01ff7f4179cdcaefd24b10ac4ee7f692':
|
| | |\ \ \
| | |/ /
| |/| |
| | | | |
Change-Id: I9d0122dbf1a9c2bd1898c41766c5bf4320f2313a
|
| | | |\|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Merge commit 'ecc76ba5516d62a886f9c290906e0ca50702c9ab' into froyo-plus-aosp
* commit 'ecc76ba5516d62a886f9c290906e0ca50702c9ab':
Set adbd to be disabled by default in recovery
|
| |\| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Merge commit 'c78a9698dd55a165c2206c380f87f173bacba2aa'
* commit 'c78a9698dd55a165c2206c380f87f173bacba2aa':
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
|
| |\| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Merge commit '21b97ed5693d039e8b9dea57a160d3307f412682'
* commit '21b97ed5693d039e8b9dea57a160d3307f412682':
Add __attribute__((format(printf, a, b))) to printf like functions.
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Replaces the "install sdcard:update zip" menu option with one that
displays a menu of zip files (and subdirs) on the sdcard and lets you
pick which one to install.
Change-Id: I85c94c0e9bc8e05ca52031fc29ca2624c2695ced
|
| |\| | |
|
| | | |
| | |
| | |
| | |
| | |
| | | |
Encrypted File Systems integration. Recovery changes.
Change-Id: I932f73a6f937aac061128e1134eab08c30f0471d
|
| |\ \ \ |
|
| | | | |
| | | |
| | | |
| | | | |
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
|
| | | | | |
|
| | |_|/
|/| | |
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | | |
|
| | |/
|/| |
|
| |/ |
|
| | |
|
| |
|
