History log of /bootable/recovery/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
cddb68b5eafbeba696d5276bda1f1a9f70bbde42 29-Oct-2014 Michael Runge <mrunge@google.com> 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
pplypatch/applypatch.c
a6c142f2a579ea5e7cdfbc88e6a061c55029265a 29-Oct-2014 Michael Runge <mrunge@google.com> Force sync files written by minzip.

Some files appear to be missing their sync to disk.

Bug: 18145574
Change-Id: Ic858624a4dd65bbfc54d30f3a13c607078270345
inzip/Zip.c
f15e31edf948d9dac11858fba6dfdff8a5cd91c9 24-Oct-2014 Michael Runge <mrunge@google.com> Log mount/unmount errors to UI

Bug: 18092022
Change-Id: I6c42038ebeb1cfc1e7ca0d3e12310fdce1b990b0
pdater/install.c
6a821fe5f054df674151d54e7b03be63afd35d58 24-Oct-2014 Nick Kralevich <nnk@google.com> 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
pdater/install.c
bd6138cffeedf1d60346ec9d34711fe38d0f8323 23-Oct-2014 Michael Runge <mrunge@google.com> Allow passing of mount args to mountFn

Bug: 18079773
Bug: 18092222

Change-Id: Ifc3f3e123de729dfbb2f49414b3207afa96268d5
pdater/install.c
7548025bdd111421cff2fe73839c01e2dc0a0365 23-Oct-2014 Michael Runge <mrunge@google.com> Log to UI any metadata setting errors

Bug: 18079773
Change-Id: Ic6fddbcbcb6ddb9e1cbd1698df98387c0033ae15
pdater/install.c
b8344b6f5908935ac2e36109c7433fde34646620 23-Oct-2014 Nick Kralevich <nnk@google.com> 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
efault_device.cpp
evice.h
ecovery.cpp
d5b1727765060b2886d11cf7af9588b818be12cf 22-Oct-2014 Michael Runge <mrunge@google.com> Treat already-renamed files as having no problems.

This should help with reentrant OTAs.

Bug: 18079773

Change-Id: I102fd738e3b450483ecd4471384c12e89fc586e2
pdater/install.c
6dcd11944644db4bd7069d189b52e3f18de0967b 22-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to a6e13ae01bff5109361868f565187f16d045c82d
e55d0326c438a23d2d1ef8263e201eae4d834bb2 21-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to a6e13ae01bff5109361868f565187f16d045c82d
b57de6082aa4d985f5333932a1f9aa3318642fd9 20-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to a6e13ae01bff5109361868f565187f16d045c82d
a23810490422ad8708a93e533fbfa12615f10be3 16-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to a6e13ae01bff5109361868f565187f16d045c82d
364860163552f06457055cfd7855ac862ef17216 15-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to a6e13ae01bff5109361868f565187f16d045c82d
c6aafd42da42d5e00089ae6d4d7f3181938f32d4 14-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to a6e13ae01bff5109361868f565187f16d045c82d
078bd9418772a96538e7b2e52f7aae0748748cdf 13-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to a6e13ae01bff5109361868f565187f16d045c82d
66b01fb51cb51518f4fdd2f88386f56708a4a7dc 12-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to a6e13ae01bff5109361868f565187f16d045c82d
b7f98256037ec04f7a08b397499904dd0468eb3c 09-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to a6e13ae01bff5109361868f565187f16d045c82d
dc5206cbb5a169183ac50c6fa6b1a94de51e55a2 08-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to a6e13ae01bff5109361868f565187f16d045c82d
f51aa2794a70664fbc24c24ad9900260bbffa931 07-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to a6e13ae01bff5109361868f565187f16d045c82d
7d393c5a32817e0e039d479d0a92151aeb6bec7b 06-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to a6e13ae01bff5109361868f565187f16d045c82d
39d267741d93c3d4caee9adf904f0391599b367c 05-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to a6e13ae01bff5109361868f565187f16d045c82d
a7aaeee9861feefbe7a88afc4cec968ea1b113bb 01-Oct-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to a6e13ae01bff5109361868f565187f16d045c82d
427df77146610e7873aaba8c37c7728cd0839c36 30-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to a6e13ae01bff5109361868f565187f16d045c82d
1986e9e6aa3b1be36be1d6e26aca9658425822bc 29-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to a6e13ae01bff5109361868f565187f16d045c82d
8e76df9660b4ebad78007a5e0f538f0fea291443 28-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to a6e13ae01bff5109361868f565187f16d045c82d
c8550225362138aad2ec79c634f21fe952ac0803 25-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to a6e13ae01bff5109361868f565187f16d045c82d
a6e13ae01bff5109361868f565187f16d045c82d 24-Sep-2014 Jeff Sharkey <jsharkey@android.com> Include reason when wiping data.

This will help us track down who requested a data wipe.

Bug: 17412160
Change-Id: I1c439fbd29f96b9851810baca9101f683a0f18d8
ecovery.cpp
96e3b4f2af1b04aa9bfa97d76e86516c6c5a6908 24-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 574443d8956802f35347cac7fae7eb16240e3c16
98faabce417fecf24314abb2c6ffac17b100224d 23-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 574443d8956802f35347cac7fae7eb16240e3c16
8e54f2fad849c6ee4b6fa586aba4584230598182 22-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 574443d8956802f35347cac7fae7eb16240e3c16
07159ef96daaa205502b8689108054f94cce4132 21-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 574443d8956802f35347cac7fae7eb16240e3c16
9e7c34c4bd8e5641f950002121228698e9c43b8b 21-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 6241a16695486469b2da9d32373fa91a96f44959
becf1e799b97aed1f6652b2ef5e807d253c308db 20-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 574443d8956802f35347cac7fae7eb16240e3c16
6241a16695486469b2da9d32373fa91a96f44959 18-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 574443d8956802f35347cac7fae7eb16240e3c16
7facb691ed41575228d13cf3661089bc37b6661a 17-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 574443d8956802f35347cac7fae7eb16240e3c16
4954d8a1fdc9c52ffc4d6ca656b6ccdc78b715a3 16-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 574443d8956802f35347cac7fae7eb16240e3c16
a160ad7ef6997a856a48cbc1225f04af08602949 15-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 574443d8956802f35347cac7fae7eb16240e3c16
4cd02aeaeb08e4d8e007f81a7daf3be6152b2df2 14-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 574443d8956802f35347cac7fae7eb16240e3c16
c02b9ef11f25b1d191751d630868edfcce1c7ec0 13-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 5e238a997176e0b6751dc27bf6eb09f2961d98f9
9bcc1875c05b182238e014f7a5359a9618edf9fe 13-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 574443d8956802f35347cac7fae7eb16240e3c16
5e238a997176e0b6751dc27bf6eb09f2961d98f9 11-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 574443d8956802f35347cac7fae7eb16240e3c16
f6eb38952558e1e207c176b48f0d172dbade1a3a 10-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 574443d8956802f35347cac7fae7eb16240e3c16
4fc827e933dbd39a832509f69699ab3cc5d46897 09-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 574443d8956802f35347cac7fae7eb16240e3c16
9c574d1d2a6c62603289090a2aab321b30f3ced7 08-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 574443d8956802f35347cac7fae7eb16240e3c16
500c1fb27c639c6b5405ab8225bc20eee63d2cc2 07-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 574443d8956802f35347cac7fae7eb16240e3c16
c398172f94ef22310ed70afcb455e2a91b8ee41d 06-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to f9bc2a544d5189ef9279edb8b5d67913eec53855
9132bd040bd0d225e6eb0dd49686d81fa25773da 06-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 574443d8956802f35347cac7fae7eb16240e3c16
f9bc2a544d5189ef9279edb8b5d67913eec53855 05-Sep-2014 Doug Zongker <dougz@google.com> 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
ncrypt/uncrypt.c
574443d8956802f35347cac7fae7eb16240e3c16 05-Sep-2014 Doug Zongker <dougz@google.com> 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
ncrypt/uncrypt.c
40482ea2ae5ca8cbcf46125f601c0bc766f99943 04-Sep-2014 Doug Zongker <dougz@google.com> Merge "fix comment in blockimg updater code" into lmp-dev
f7bb09dae8d7c89130648ef2aca7025860b6d801 04-Sep-2014 Doug Zongker <dougz@google.com> fix comment in blockimg updater code

The comment for the DEBUG_ERASE setting is exactly backwards.

Change-Id: I98ab5828365894217fc78976817a131e7d22d5c1
pdater/blockimg.c
8328922ff040280007da0aaaf8b567581231d5ed 03-Sep-2014 Andrew Boie <andrew.p.boie@intel.com> 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>
pdater/blockimg.c
603a1609fb4da8c7b0e1469aea8c03f4d1ce0a8d 04-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 5f875bf57739bf0b5c2d182173513233bdb71ab8
41f13f4276b2ee63e0efce085afd00589f3f59c6 03-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 5f875bf57739bf0b5c2d182173513233bdb71ab8
cdbd52f5a33d89232d1907f5b88d2925fbdb2cbd 02-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 5f875bf57739bf0b5c2d182173513233bdb71ab8
c7709c56c2902e7fb1b473280af3682cf71d3cb5 01-Sep-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 5f875bf57739bf0b5c2d182173513233bdb71ab8
afe031d2ca476129134094a20a5115a10a722ad2 31-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 5f875bf57739bf0b5c2d182173513233bdb71ab8
5e7308a59c6011710c11fb822726d7fb9cf687fd 27-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 5f875bf57739bf0b5c2d182173513233bdb71ab8
5f875bf57739bf0b5c2d182173513233bdb71ab8 22-Aug-2014 Doug Zongker <dougz@google.com> remove code for original block OTA mechanism

Superseded by newer code.

Bug: 16984795
Change-Id: I842299f6a02af7ccf51ef2ca174d813ca53deef1
pdater/Android.mk
pdater/install.c
ff14eb2895b16475999f7ec3d37245b61814d454 26-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to lmp-dev
f449db2f30235a0c2fef4bc7bc41776e271a60a0 26-Aug-2014 Doug Zongker <dougz@google.com> 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
ncrypt/Android.mk
ncrypt/uncrypt.c
22427ff6d2a332c620f517b752438e20908ade26 26-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 1d5d6098f4a470bc8e56ae8914180041815e6e22
8315f88e6da08841d73aa660b2402fdf2389a205 25-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 1d5d6098f4a470bc8e56ae8914180041815e6e22
19eeee5a9e619cef4f211bc2c221ba17ff73850d 24-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 1d5d6098f4a470bc8e56ae8914180041815e6e22
796e556e8feb14086a512b0c4b2397f68d58b14b 23-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 1d5d6098f4a470bc8e56ae8914180041815e6e22
f2127b6435eedd2c2c57a480a0ed049fee014406 21-Aug-2014 Doug Zongker <dougz@google.com> 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
pdater/blockimg.c
1d5d6098f4a470bc8e56ae8914180041815e6e22 21-Aug-2014 Doug Zongker <dougz@google.com> 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
pdater/blockimg.c
314b3e31c3696de8269c5954fa3c6c7e3622418f 21-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to bc7ffeda98a861e346c30c771d3258030f7fcf21
c96ad7837b1cc722a45558fc6c6f1808c8df8f96 20-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to bc7ffeda98a861e346c30c771d3258030f7fcf21
bc7ffeda98a861e346c30c771d3258030f7fcf21 15-Aug-2014 Doug Zongker <dougz@google.com> installer for new block OTA system

(Cherry-pick back from master.)

Bug: 16984795
Change-Id: Ifa3d8345c5e2a0be86fb28faa080ca82592a96b4
pplypatch/applypatch.c
pplypatch/applypatch.h
pplypatch/bspatch.c
pplypatch/imgpatch.c
pdater/Android.mk
pdater/blockimg.c
pdater/blockimg.h
pdater/install.c
pdater/updater.c
pdater/updater.h
7f48b43e23fbaf1b0727df26e17bb76f5b53cf1f 19-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 2efc9d994ce59f9ebfc2290c2adc5d760e8939c2
2efc9d994ce59f9ebfc2290c2adc5d760e8939c2 19-Aug-2014 Doug Zongker <dougz@google.com> 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
ncrypt/uncrypt.c
e5645ff3a29eae143ab6a90334d9f167a7b6da6a 18-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 1a35a586904cd429fd3a6a6c2de64a16ccdf693d
3c5bfe5b5856b5d587a9275aac05aede069f8b44 17-Aug-2014 The Android Automerger <android-build@google.com> merge in lmp-release history after reset to 1a35a586904cd429fd3a6a6c2de64a16ccdf693d
1a35a586904cd429fd3a6a6c2de64a16ccdf693d 14-Aug-2014 Doug Zongker <dougz@google.com> revert uncrypt back to dynamic linking, fix libs

Bug: 17029174, 17015157
Change-Id: I1d24f3402875dfb972daa6daef0f385baeff84e9
ncrypt/Android.mk
64be82755cc42b05775265b87a0c64242a72d0dd 14-Aug-2014 Doug Zongker <dougz@google.com> change uncrypt to static linking

Bug: 17015157
Change-Id: I3c4bdcf4f11d44b617bb731a48413e3707044d1c
ncrypt/Android.mk
537d34f907a5e984ccad1c88825adc8ae9814834 14-Aug-2014 Doug Zongker <dougz@google.com> change uncrypt to static linking

Bug: 17015157
Change-Id: I3c4bdcf4f11d44b617bb731a48413e3707044d1c
ncrypt/Android.mk
9dc71cfa5233789a50d8a9d2c9af87d0f106d4ad 06-Aug-2014 Andres Morales <anmorales@google.com> Merge "Erase PST partition if its marked to be erased." into lmp-dev
ee19387905650cab5da7dd97ada5502cd17ac93d 06-Aug-2014 Andres Morales <anmorales@google.com> 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
ecovery.cpp
oots.cpp
oots.h
2b5f0e0f767ce51d9605809052ad04fe83d1df83 06-Aug-2014 Doug Zongker <dougz@google.com> 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
pdater/install.c
78d458c3d279a24a60fda013026b7a5454d01a9b 05-Aug-2014 JP Abgrall <jpa@google.com> Fix length printing + formats

Fix wrong argument order.
Fix for 32 vs 64 bit.

(reported by htc)

Change-Id: Ie37a280bed2848199bcc075500e1326e371cd326
oots.cpp
eaf33654c1817bd665831a13c5bd0c04daabee02 31-Jul-2014 Doug Zongker <dougz@google.com> only do uncryption on packages in /data

If recovery is invoked with a package somewhere other than /data,
leave it alone.

Change-Id: Ief358b53df467ae24a65e30e7a631da59bf13683
ncrypt/uncrypt.c
a91ecc59b2753a3dcc93b2619559a980074e77bd 22-Jul-2014 Michael Runge <mrunge@google.com> 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
pdater/install.c
pdater/install.h
945fc68c62692467ddb8b7d714bcf0bf01c783c2 10-Jul-2014 Doug Zongker <dougz@google.com> do sdcard sideloading through the fuse filesystem

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
ndroid.mk
use_sdcard_provider.c
use_sdcard_provider.h
ecovery.cpp
18a78e0a162c35756628610307f41179816d3333 10-Jul-2014 Doug Zongker <dougz@google.com> refactor fuse sideloading code

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
ndroid.mk
db_install.cpp
use_sideload.c
use_sideload.h
inadbd/Android.mk
inadbd/adb.h
inadbd/fuse_adb_provider.c
inadbd/fuse_adb_provider.h
inadbd/fuse_sideload.c
inadbd/fuse_sideload.h
inadbd/services.c
93950229cf9a991589f6bb071a966b00349d18d6 08-Jul-2014 Doug Zongker <dougz@google.com> drop APPLY_CACHE and refactor APPLY_EXT

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
evice.h
ecovery.cpp
075ad800c539503d0515e5e0b4af160eccedead9 27-Jun-2014 Doug Zongker <dougz@google.com> sideload without holding the whole package in RAM

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
db_install.cpp
tc/init.rc
nstall.cpp
nstall.h
inadbd/Android.mk
inadbd/adb.c
inadbd/adb.h
inadbd/fuse_sideload.c
inadbd/fuse_sideload.h
inadbd/services.c
ecovery.cpp
e8d7dd4ed1a372cb9bf67a1f7ff55aaa3e152053 25-Jun-2014 Riley Andrews <riandrews@google.com> am 3e0fc39e: am 974fe112: Merge "Fix recovery mode."

* commit '3e0fc39ec27c0ed96ffd2a617f1841fe3bf3c8f6':
Fix recovery mode.
3e0fc39ec27c0ed96ffd2a617f1841fe3bf3c8f6 25-Jun-2014 Riley Andrews <riandrews@google.com> am 974fe112: Merge "Fix recovery mode."

* commit '974fe112ae6df95ca6d49688d6e3e459d87e16de':
Fix recovery mode.
22bcf97a5949816db85242157cb2640feed73616 24-Jun-2014 Colin Cross <ccross@android.com> recovery: enable panic_on_oops

Set panic_on_oops=1 to reboot if the kernel panics.

Change-Id: Id9e8689a570229db2ea2a3d72b52784f8a1ed107
tc/init.rc
974fe112ae6df95ca6d49688d6e3e459d87e16de 25-Jun-2014 Riley Andrews <riandrews@google.com> Merge "Fix recovery mode."
e739d7e6cd94e8300f9ea61a2d57d88328755b9f 25-Jun-2014 Riley Andrews <riandrews@google.com> 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
tc/init.rc
b9afc2bf15822d09af188912ac27bd81bf078394 18-Jun-2014 Ji-Hwan Lee <jihwan@google.com> Use LOCAL_REQUIRED_MODULES for mkfs.f2fs

Instead of LOCAL_ADDITIONAL_DEPENDENCIES.

Bug: 15702524
Change-Id: Ic152ae60354bf09eccdb9a85dcd04f0f076a6422
ndroid.mk
37aedb3fafcccd0da5bd9089987f05895c27492d 17-Jun-2014 JP Abgrall <jpa@google.com> Support F2FS for the data partition

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>
ndroid.mk
oots.cpp
pdater/install.c
ba545d7e2388e81e985a43fc86d191590b923c90 04-Jun-2014 Joey Pan <joey.pan@mediatek.com> minui: avoid random screen frame at startup

Clear framebuffer at init.

[toddpoynor@google.com: forward port]
Change-Id: Ie98c7724cd974dcacef3e3559a6fe492864a5e72
inui/graphics_fbdev.c
43772d26a5d8d31fd092a21edfca346f3b3901e7 09-Jun-2014 Doug Zongker <dougz@google.com> advance progress bar during block OTA installations

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
pdater/install.c
3fa26c9fa29bce2a89d8daebd5437912d6fe97ba 06-Jun-2014 Doug Zongker <dougz@google.com> am dff8afe1: (-s ours) restore holo UI in recovery -- DO NOT MERGE

* commit 'dff8afe1b21c6ffe09269434f9f8f0d166e1a848':
restore holo UI in recovery -- DO NOT MERGE
9a5f58427a2b3a5711e5036a4c9c32c5f23f91b0 06-Jun-2014 Doug Zongker <dougz@google.com> Merge "restore holo UI in recovery"
5b5f6c2fd32839227d10ee3c97e662a415b80e2b 03-Jun-2014 Doug Zongker <dougz@google.com> restore holo UI in recovery

Return to the recovery to the holo appearance.

Bug: 15424396
Change-Id: Id4d3f23e0a6251a12aa42f3793cff347f38b4243
es-hdpi/images/progress_empty.png
es-hdpi/images/progress_fill.png
es-mdpi/images/progress_empty.png
es-mdpi/images/progress_fill.png
es-xhdpi/images/progress_empty.png
es-xhdpi/images/progress_fill.png
es-xxhdpi/images/progress_empty.png
es-xxhdpi/images/progress_fill.png
es-xxxhdpi/images/progress_empty.png
es-xxxhdpi/images/progress_fill.png
creen_ui.cpp
creen_ui.h
ad07492046ee9721cf61e51255ae6b7ee3987697 06-Jun-2014 Doug Zongker <dougz@android.com> am 54a61179: am cfd4b286: Merge "recovery: initialize keys press tracking status"

* commit '54a6117935fe7470d23f7a538aeec9d6b139791b':
recovery: initialize keys press tracking status
54a6117935fe7470d23f7a538aeec9d6b139791b 06-Jun-2014 Doug Zongker <dougz@android.com> am cfd4b286: Merge "recovery: initialize keys press tracking status"

* commit 'cfd4b2864534f062a01730d81b2cd7e054087e8f':
recovery: initialize keys press tracking status
cfd4b2864534f062a01730d81b2cd7e054087e8f 06-Jun-2014 Doug Zongker <dougz@android.com> Merge "recovery: initialize keys press tracking status"
187d626e6108298b436f22657a8e14658c15d910 06-Jun-2014 Mihai Serban <mihai.serban@intel.com> 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>
i.cpp
dff8afe1b21c6ffe09269434f9f8f0d166e1a848 03-Jun-2014 Doug Zongker <dougz@google.com> 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
es-hdpi/images/progress_empty.png
es-hdpi/images/progress_fill.png
es-mdpi/images/progress_empty.png
es-mdpi/images/progress_fill.png
es-xhdpi/images/progress_empty.png
es-xhdpi/images/progress_fill.png
es-xxhdpi/images/progress_empty.png
es-xxhdpi/images/progress_fill.png
es-xxxhdpi/images/progress_empty.png
es-xxxhdpi/images/progress_fill.png
creen_ui.cpp
creen_ui.h
c704e06ce596bd0a6de66b10b108aee95535468a 23-May-2014 Doug Zongker <dougz@android.com> disable async reboot during package installation

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
nstall.cpp
i.cpp
i.h
pdater/install.c
ffb557d351776bed40818fa77afaa743d9e34a34 16-May-2014 Doug Zongker <dougz@android.com> am 502e4595: am d1c64060: am 5fbb729f: Merge "exit instead of return if sideload file creation fails"

* commit '502e45957420484eec2367e7580e9bec96605c5d':
exit instead of return if sideload file creation fails
502e45957420484eec2367e7580e9bec96605c5d 16-May-2014 Doug Zongker <dougz@android.com> am d1c64060: am 5fbb729f: Merge "exit instead of return if sideload file creation fails"

* commit 'd1c64060abf8a56a259c0913244448fdba245f6c':
exit instead of return if sideload file creation fails
d1c64060abf8a56a259c0913244448fdba245f6c 16-May-2014 Doug Zongker <dougz@android.com> am 5fbb729f: Merge "exit instead of return if sideload file creation fails"

* commit '5fbb729f3eb67c9bb59580f692a31e5c50e24e6d':
exit instead of return if sideload file creation fails
5fbb729f3eb67c9bb59580f692a31e5c50e24e6d 16-May-2014 Doug Zongker <dougz@android.com> Merge "exit instead of return if sideload file creation fails"
ddb1b744983e37b51fc20759bbf8dac31f4d30ad 16-May-2014 Doug Zongker <dougz@google.com> am c4804e9b: am d4592694: am 3ca99f6c: Merge "fix vulnerability in bspatch"

* commit 'c4804e9b9c143652d17441b4b672b920b11cc94a':
fix vulnerability in bspatch
c4804e9b9c143652d17441b4b672b920b11cc94a 16-May-2014 Doug Zongker <dougz@google.com> am d4592694: am 3ca99f6c: Merge "fix vulnerability in bspatch"

* commit 'd4592694b41d5f8309d98cd3312b5486216cc685':
fix vulnerability in bspatch
d4592694b41d5f8309d98cd3312b5486216cc685 16-May-2014 Doug Zongker <dougz@google.com> am 3ca99f6c: Merge "fix vulnerability in bspatch"

* commit '3ca99f6cb8ffbe19c7ef5409f3dac18ea0c254bd':
fix vulnerability in bspatch
3ca99f6cb8ffbe19c7ef5409f3dac18ea0c254bd 16-May-2014 Doug Zongker <dougz@google.com> Merge "fix vulnerability in bspatch"
eed64836386a64cc945e7e9a01a96ed0d6fa57af 14-May-2014 Doug Zongker <dougz@android.com> am 0766cdf4: am d2fb4ed5: am d27aa76a: Merge "Support BGRA framebuffer"

* commit '0766cdf49acb77677864995e931eec391243505d':
Support BGRA framebuffer
0766cdf49acb77677864995e931eec391243505d 14-May-2014 Doug Zongker <dougz@android.com> am d2fb4ed5: am d27aa76a: Merge "Support BGRA framebuffer"

* commit 'd2fb4ed58997afd18bd2b5274bf1835644d454fb':
Support BGRA framebuffer
d2fb4ed58997afd18bd2b5274bf1835644d454fb 14-May-2014 Doug Zongker <dougz@android.com> am d27aa76a: Merge "Support BGRA framebuffer"

* commit 'd27aa76a6ff6436cfb8340bf3d04aba186cc4de1':
Support BGRA framebuffer
d27aa76a6ff6436cfb8340bf3d04aba186cc4de1 14-May-2014 Doug Zongker <dougz@android.com> Merge "Support BGRA framebuffer"
f766396d9931e1879161132c26fe61453065f450 19-Mar-2014 Daniel Leung <daniel.leung@intel.com> 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>
inui/graphics_fbdev.c
8c7457a2c56d0fad2f59d017bcbdbcac72e419b3 13-May-2014 Doug Zongker <dougz@android.com> am 48abd574: am 34ff5fe3: am 74b90b30: Merge "screen_ui: Initialize text buffer"

* commit '48abd574cb1b7b0adbe1de36224fb974182aaa2d':
screen_ui: Initialize text buffer
48abd574cb1b7b0adbe1de36224fb974182aaa2d 13-May-2014 Doug Zongker <dougz@android.com> am 34ff5fe3: am 74b90b30: Merge "screen_ui: Initialize text buffer"

* commit '34ff5fe3f59abfb1984189ade32059cc47bf97e5':
screen_ui: Initialize text buffer
34ff5fe3f59abfb1984189ade32059cc47bf97e5 13-May-2014 Doug Zongker <dougz@android.com> am 74b90b30: Merge "screen_ui: Initialize text buffer"

* commit '74b90b309f67dc3b8bb74e47c4eddf7ce511bc35':
screen_ui: Initialize text buffer
74b90b309f67dc3b8bb74e47c4eddf7ce511bc35 13-May-2014 Doug Zongker <dougz@android.com> Merge "screen_ui: Initialize text buffer"
4aa12dd0decafb139239779ab38e6ffda23109ab 13-May-2014 Doug Zongker <dougz@google.com> 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
pplypatch/bspatch.c
f5d9f891524862ba560650bd545668dc22622cdb 07-May-2014 Michael Runge <mrunge@google.com> Allow 0-byte files in full OTAs.

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
inzip/Zip.c
64e7fcd9255734e5b12cd50263563951b4e4664e 03-May-2014 Greg Hackmann <ghackmann@google.com> am e9f9238a: am 1cd52423: am 1c2cf1db: Merge "recovery: minui: add adf backend"

* commit 'e9f9238af83f949dc000667356eba025e1241a2f':
recovery: minui: add adf backend
e9f9238af83f949dc000667356eba025e1241a2f 03-May-2014 Greg Hackmann <ghackmann@google.com> am 1cd52423: am 1c2cf1db: Merge "recovery: minui: add adf backend"

* commit '1cd5242349bb1ef10eca76ff2c3e17415aecdf9d':
recovery: minui: add adf backend
1cd5242349bb1ef10eca76ff2c3e17415aecdf9d 03-May-2014 Greg Hackmann <ghackmann@google.com> am 1c2cf1db: Merge "recovery: minui: add adf backend"

* commit '1c2cf1db0db2c9e9310d27bdc19c605f5537b72f':
recovery: minui: add adf backend
1c2cf1db0db2c9e9310d27bdc19c605f5537b72f 03-May-2014 Greg Hackmann <ghackmann@google.com> Merge "recovery: minui: add adf backend"
aa1a31e83d25e6c3c3371063704eeb14558a595e 26-Apr-2014 Michael Runge <mrunge@google.com> Allow lines without = signs.

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
pdater/install.c
ff5fc6c809e87dd34c2950b6d8cbac67ed5df347 30-Apr-2014 Bill Yi <byi@google.com> am ddaaccb3: am 29759e9d: Merge commit \'25c2b2f670a3b11f7ce78eccde10c1a79188c9a8\' into HEAD

* commit 'ddaaccb3db623ff6f19b7dadf51d41cc46bb05c3':
ddaaccb3db623ff6f19b7dadf51d41cc46bb05c3 30-Apr-2014 Bill Yi <byi@google.com> am 29759e9d: Merge commit \'25c2b2f670a3b11f7ce78eccde10c1a79188c9a8\' into HEAD

* commit '29759e9d518880adba366c502cf79d53c48a31bb':
29759e9d518880adba366c502cf79d53c48a31bb 29-Apr-2014 Bill Yi <byi@google.com> Merge commit '25c2b2f670a3b11f7ce78eccde10c1a79188c9a8' into HEAD
41909ddefbb57a9ce3c417341c1f83261e482046 25-Apr-2014 Greg Hackmann <ghackmann@google.com> recovery: minui: add adf backend

Change-Id: I1ad97b5b62bddbcb1104fa0b4e54415b793a4194
Signed-off-by: Greg Hackmann <ghackmann@google.com>
leanSpec.mk
inui/Android.mk
inui/graphics.c
inui/graphics.h
inui/graphics_adf.c
5ec6f4daaf5269534daeaa0b1229bcb7bab93591 18-Apr-2014 Benoit Goby <benoit@android.com> am 9e8d81ba: am 0e22af65: recovery: Fix adb with linux 3.10

* commit '9e8d81ba96b299cc084723797d9f492d4441d57a':
recovery: Fix adb with linux 3.10
9e8d81ba96b299cc084723797d9f492d4441d57a 18-Apr-2014 Benoit Goby <benoit@android.com> am 0e22af65: recovery: Fix adb with linux 3.10

* commit '0e22af658c89fb53ab1215a3538bbaf10d733ad9':
recovery: Fix adb with linux 3.10
0e22af658c89fb53ab1215a3538bbaf10d733ad9 20-Feb-2014 Benoit Goby <benoit@android.com> 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
tc/init.rc
346e11816da25172800edf08c94eabd5221926bf 12-Apr-2014 Sasha Levitskiy <sanek@google.com> am ecf1f6c9: am 558f2700: Merge "Change filesystem add entry API call."

* commit 'ecf1f6c9299c0cae2f2bf1647f5d7d3a2690f819':
Change filesystem add entry API call.
ecf1f6c9299c0cae2f2bf1647f5d7d3a2690f819 12-Apr-2014 Sasha Levitskiy <sanek@google.com> am 558f2700: Merge "Change filesystem add entry API call."

* commit '558f2700e18d50cf8e798254200ef37f7a09678d':
Change filesystem add entry API call.
558f2700e18d50cf8e798254200ef37f7a09678d 12-Apr-2014 Sasha Levitskiy <sanek@google.com> Merge "Change filesystem add entry API call."
85ef47dd84f5bbf3fa5804f3f3a240ef736818e6 11-Apr-2014 Sasha Levitskiy <sanek@google.com> Change filesystem add entry API call.

Needs fs_mgr matching change from: Icf23e659265d71d5226d527c2b40cfbc132320ee

Change-Id: I9adb470b04e4301989d128c9c3097b21b4dea431
Signed-off-by: Sasha Levitskiy <sanek@google.com>
oots.cpp
9551cf912180665a85f515c16d6412bb8ea2bf98 04-Apr-2014 Doug Zongker <dougz@android.com> make density-specific recovery assets

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
es-hdpi/images/erasing_text.png
es-hdpi/images/error_text.png
es-hdpi/images/icon_error.png
es-hdpi/images/icon_installing.png
es-hdpi/images/installing_text.png
es-hdpi/images/no_command_text.png
es-hdpi/images/progress_empty.png
es-hdpi/images/progress_fill.png
es-hdpi/images/stage_empty.png
es-hdpi/images/stage_fill.png
es-mdpi/images/erasing_text.png
es-mdpi/images/error_text.png
es-mdpi/images/icon_error.png
es-mdpi/images/icon_installing.png
es-mdpi/images/installing_text.png
es-mdpi/images/no_command_text.png
es-mdpi/images/progress_empty.png
es-mdpi/images/progress_fill.png
es-mdpi/images/stage_empty.png
es-mdpi/images/stage_fill.png
es-xhdpi/images/erasing_text.png
es-xhdpi/images/error_text.png
es-xhdpi/images/icon_error.png
es-xhdpi/images/icon_installing.png
es-xhdpi/images/installing_text.png
es-xhdpi/images/no_command_text.png
es-xhdpi/images/progress_empty.png
es-xhdpi/images/progress_fill.png
es-xhdpi/images/stage_empty.png
es-xhdpi/images/stage_fill.png
es-xxhdpi/images/erasing_text.png
es-xxhdpi/images/error_text.png
es-xxhdpi/images/icon_error.png
es-xxhdpi/images/icon_installing.png
es-xxhdpi/images/installing_text.png
es-xxhdpi/images/no_command_text.png
es-xxhdpi/images/progress_empty.png
es-xxhdpi/images/progress_fill.png
es-xxhdpi/images/stage_empty.png
es-xxhdpi/images/stage_fill.png
es-xxxhdpi/images/erasing_text.png
es-xxxhdpi/images/error_text.png
es-xxxhdpi/images/icon_error.png
es-xxxhdpi/images/icon_installing.png
es-xxxhdpi/images/installing_text.png
es-xxxhdpi/images/no_command_text.png
es-xxxhdpi/images/progress_empty.png
es-xxxhdpi/images/progress_fill.png
es-xxxhdpi/images/stage_empty.png
es-xxxhdpi/images/stage_fill.png
es/images/erasing_text.png
es/images/error_text.png
es/images/icon_error.png
es/images/icon_installing.png
es/images/installing_text.png
es/images/no_command_text.png
es/images/progress_empty.png
es/images/progress_fill.png
es/images/stage_empty.png
es/images/stage_fill.png
creen_ui.cpp
creen_ui.h
8d9d3d5cbe240d09db10d08956d152dce934e892 01-Apr-2014 Doug Zongker <dougz@android.com> add reboot-to-bootloader and power down options to recovery menu

Useful when debugging or developing for recovery.

Change-Id: Ic3ab42d5e848ad3488f1c575339b55e45c8a024b
efault_device.cpp
evice.h
ecovery.cpp
02abde50851f66196c74d215150014f1378cb853 01-Apr-2014 Doug Zongker <dougz@android.com> remove DefaultDevice's UI subclass

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
efault_device.cpp
i.cpp
276f37e4d4596ca2eeea801046d75ec10a702b78 21-Mar-2014 Paul Lawrence <paullawrence@google.com> Merge "Fix build break caused by vold change"
3e1cadc8f5b4f1a197de1d11606acef8493f0dc6 20-Mar-2014 Doug Zongker <dougz@google.com> am 03008bc1: am aa4545b5: Merge "restore minui support for paletted images with < 8 bits"

* commit '03008bc1e89a780e382abe0567e709daecce92ff':
restore minui support for paletted images with < 8 bits
03008bc1e89a780e382abe0567e709daecce92ff 20-Mar-2014 Doug Zongker <dougz@google.com> am aa4545b5: Merge "restore minui support for paletted images with < 8 bits"

* commit 'aa4545b5aedae165c8d2db0009dcdfa18e4f7923':
restore minui support for paletted images with < 8 bits
25c2b2f670a3b11f7ce78eccde10c1a79188c9a8 20-Mar-2014 Doug Zongker <dougz@google.com> am aa4545b5: Merge "restore minui support for paletted images with < 8 bits"

* commit 'aa4545b5aedae165c8d2db0009dcdfa18e4f7923':
restore minui support for paletted images with < 8 bits
aa4545b5aedae165c8d2db0009dcdfa18e4f7923 20-Mar-2014 Doug Zongker <dougz@google.com> Merge "restore minui support for paletted images with < 8 bits"
577a1304352c12d968c11a667f50cd45498cae17 20-Mar-2014 Doug Zongker <dougz@google.com> 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
inui/resources.c
2605dec597f7ebabf31b7e9430f19ab888b2919a 19-Mar-2014 Mark Salyzyn <salyzyn@google.com> recovery: 64 bit build issues

Change-Id: Ie88c49dea13cce5f4eb428e97f5a0956f2656a30
ncrypt/uncrypt.c
b07b3d15b9b36c286440412e489659131e738e74 18-Mar-2014 Doug Zongker <dougz@google.com> am 03002477: am bacf9b45: add --shutdown_after option to recovery

* commit '0300247758cf1965867128c79d94e0b2c38a69aa':
add --shutdown_after option to recovery
a898c52b6414ca76a137955d9e427fa280863eff 18-Mar-2014 Doug Zongker <dougz@google.com> am b4bbf887: resolved conflicts for merge of 708aa238 to klp-modular-dev-plus-aosp

* commit 'b4bbf8878c3a6b2a17a3a96f1a23300748dbd81a':
add --shutdown_after option to recovery
0300247758cf1965867128c79d94e0b2c38a69aa 18-Mar-2014 Doug Zongker <dougz@google.com> am bacf9b45: add --shutdown_after option to recovery

* commit 'bacf9b4558c69e918d9c05b6f111bbb223829829':
add --shutdown_after option to recovery
bacf9b4558c69e918d9c05b6f111bbb223829829 18-Mar-2014 Doug Zongker <dougz@google.com> 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
ecovery.cpp
b4bbf8878c3a6b2a17a3a96f1a23300748dbd81a 18-Mar-2014 Doug Zongker <dougz@google.com> resolved conflicts for merge of 708aa238 to klp-modular-dev-plus-aosp

Change-Id: I3d00437d519f93652ccae6b361e89e853ccae9b3
a7d211c6ad6a3d12120993ad96f9159016843d30 18-Mar-2014 Doug Zongker <dougz@google.com> resolved conflicts for merge of 708aa238 to klp-dev-plus-aosp

Change-Id: Ib1d15be84cec58e23472ef2014d322f3f55c6bb8
708aa23801b0bc8349ab017c92c0deaf9d767c52 18-Mar-2014 Doug Zongker <dougz@google.com> Merge "add --shutdown_after option to recovery"
b1d1263453de7f0f155628b91658a7cccb2e95fd 18-Mar-2014 Doug Zongker <dougz@google.com> 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
ecovery.cpp
7425d035ef70a831a6b8b0d85718244195d69aef 18-Mar-2014 Doug Zongker <dougz@google.com> am 47c7e365: am 130a7985: Merge "fix error log statement"

* commit '47c7e365071f75489604b2d0ba3109fe39bac1ef':
fix error log statement
47c7e365071f75489604b2d0ba3109fe39bac1ef 18-Mar-2014 Doug Zongker <dougz@google.com> am 130a7985: Merge "fix error log statement"

* commit '130a7985386f7f7741179fc38b1a15da7ec9f358':
fix error log statement
2b3737224efaa7ff69404e48454d7fa11c30e89c 18-Mar-2014 Doug Zongker <dougz@google.com> am 130a7985: Merge "fix error log statement"

* commit '130a7985386f7f7741179fc38b1a15da7ec9f358':
fix error log statement
130a7985386f7f7741179fc38b1a15da7ec9f358 18-Mar-2014 Doug Zongker <dougz@google.com> Merge "fix error log statement"
a388a769760af4d8999558f38f81dafa63cc0bfb 18-Mar-2014 Doug Zongker <dougz@google.com> fix error log statement

We were printing the address of channels instead of the value there.

Change-Id: I652340c7c1a0abaf01af555e54d2c0366d21ad78
inui/resources.c
a68c517c628acdcfd0107536f34c3fd882ce0629 18-Mar-2014 Doug Zongker <dougz@google.com> am 80c1a386: resolved conflicts for merge of d90da130 to klp-modular-dev-plus-aosp

* commit '80c1a386d3f614919708b37986919ecaf74ee738':
refactor image resource loading code in minui
c4025e90f4e73bd9bf9665000276663e35c0066b 18-Mar-2014 Doug Zongker <dougz@google.com> resolved conflicts for merge of d90da130 to klp-dev-plus-aosp

Change-Id: I19f9f460145fdcf5cdc58ee4fa25ff3c9ba398f0
80c1a386d3f614919708b37986919ecaf74ee738 18-Mar-2014 Doug Zongker <dougz@google.com> resolved conflicts for merge of d90da130 to klp-modular-dev-plus-aosp

Change-Id: Ib95b5bcd8d24014e1f2a956d2f31c99a471d3e30
76b245c24c12feec2381c423de2f7ffe4b78d7f0 17-Mar-2014 Mark Salyzyn <salyzyn@google.com> minzip: 64 bit build issue

Regression - verification and extraction on memory, not files

Bug: 12188746
Change-Id: Ib6facc4aff6be3a31a7d184ef1c493fdd4012c21
inzip/SysUtil.c
d90da13076303a5377de631623e16c34ee195830 17-Mar-2014 Doug Zongker <dougz@google.com> Merge "refactor image resource loading code in minui"
a418aa7dd5e94cbf1ab2a6fa1c63f60e5e087d42 17-Mar-2014 Doug Zongker <dougz@google.com> refactor image resource loading code in minui

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
inui/graphics.c
inui/minui.h
inui/resources.c
ecovery.cpp
creen_ui.cpp
creen_ui.h
679baa06b79e0c9100ce05fa0191928fc2a691fb 14-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 4b6de1ba: am 026ebe02: Merge "Recovery 64-bit compile issues"

* commit '4b6de1ba1ce0fff95c18a8abb7ba6e5762006d49':
Recovery 64-bit compile issues
52d0b765ab58e7def9783623092f1891a4d7f427 14-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 026ebe02: Merge "Recovery 64-bit compile issues"

* commit '026ebe0214d6c1c9b3ddc22c35e9ac37e5f622bc':
Recovery 64-bit compile issues
4b6de1ba1ce0fff95c18a8abb7ba6e5762006d49 14-Mar-2014 Mark Salyzyn <salyzyn@google.com> am 026ebe02: Merge "Recovery 64-bit compile issues"

* commit '026ebe0214d6c1c9b3ddc22c35e9ac37e5f622bc':
Recovery 64-bit compile issues
026ebe0214d6c1c9b3ddc22c35e9ac37e5f622bc 14-Mar-2014 Mark Salyzyn <salyzyn@google.com> Merge "Recovery 64-bit compile issues"
f3bb31c32fa879ccce358c15c93b7bd8582d1756 14-Mar-2014 Mark Salyzyn <salyzyn@google.com> Recovery 64-bit compile issues

Change-Id: I92d5abd1a628feab3b0246924fab7f97ba3b9d34
pplypatch/applypatch.c
pplypatch/imgpatch.c
inadbd/sockets.c
inadbd/transport.c
inadbd/usb_linux_client.c
inui/graphics_fbdev.c
inui/resources.c
ecovery.cpp
ools/ota/add-property-tag.c
pdater/install.c
erifier.cpp
d6e6303df49bc5455f008f4ad9ea6794a512e3dd 13-Mar-2014 Doug Zongker <dougz@android.com> am a7266ef0: Merge "separate fbdev-specific code out from minui"

* commit 'a7266ef0b1804e3ddeea58bda9a416e807a55f88':
separate fbdev-specific code out from minui
4048200cd6baf8df35f7100afbdbd3067502eae8 13-Mar-2014 Doug Zongker <dougz@android.com> am c91612d4: Merge "remove pixelflinger from recovery"

* commit 'c91612d4668688c5d7bf76c258c11010697a03d2':
remove pixelflinger from recovery
546f357d038466b0fd055a5d9a6baee20e8cdcfe 13-Mar-2014 Doug Zongker <dougz@android.com> am 8f087d02: Merge "update tools for making recovery images"

* commit '8f087d024619467de8609656e8a14370f24b817c':
update tools for making recovery images
8e7bccd9a45504eede8c11fe86bb97cee475ad2a 13-Mar-2014 Doug Zongker <dougz@android.com> am 59508993: Merge "allow CheckKey to request mounting /system"

* commit '5950899369b712f66aa56c857c66ed1b6741f0e0':
allow CheckKey to request mounting /system
cfcec9e1d468708269edbd1e8520d1253989aefb 13-Mar-2014 Doug Zongker <dougz@google.com> Merge commit 'ea868b38' into manualmerge

Conflicts:
screen_ui.cpp
screen_ui.h

Change-Id: Iefe7dde04cc76639f56730a19238436073f18ffb
679be487206a9f987b553fad081efb455bd28fcf 12-Mar-2014 Doug Zongker <dougz@android.com> am 239fb930: am a7266ef0: Merge "separate fbdev-specific code out from minui"

* commit '239fb930e4d91de5d3a66997d32d43414055d40e':
separate fbdev-specific code out from minui
cb2bf046f55e7c603cd64bc7ab5e3176f94fee64 12-Mar-2014 Doug Zongker <dougz@android.com> am cb1bdc9e: (-s ours) am c91612d4: Merge "remove pixelflinger from recovery"

* commit 'cb1bdc9e427b8b7262d1e56fef47d2bb6d76139f':
remove pixelflinger from recovery
b3a584f162e5e96a543ef7ec4e60231eaea64a93 12-Mar-2014 Doug Zongker <dougz@android.com> am 7003ff3b: am 8f087d02: Merge "update tools for making recovery images"

* commit '7003ff3b54e9081dba92ecfea0594355af40e6dd':
update tools for making recovery images
e319a0d08e6961abe32c551070d5d485965c26af 12-Mar-2014 Doug Zongker <dougz@android.com> am aa6b8026: (-s ours) am 59508993: Merge "allow CheckKey to request mounting /system"

* commit 'aa6b8026ed5ae32f10b948edd26e3f489ba20751':
allow CheckKey to request mounting /system
4fff5aa7dcd4fd634e1fd11974e57e073c9567b0 12-Mar-2014 Doug Zongker <dougz@google.com> am c15b7865: (-s ours) resolved conflicts for merge of ea868b38 to klp-modular-dev-plus-aosp

* commit 'c15b7865badc3ac406a7ce978baa65151a50bb55':
change how recovery animation is implemented
239fb930e4d91de5d3a66997d32d43414055d40e 12-Mar-2014 Doug Zongker <dougz@android.com> am a7266ef0: Merge "separate fbdev-specific code out from minui"

* commit 'a7266ef0b1804e3ddeea58bda9a416e807a55f88':
separate fbdev-specific code out from minui
cb1bdc9e427b8b7262d1e56fef47d2bb6d76139f 12-Mar-2014 Doug Zongker <dougz@android.com> am c91612d4: Merge "remove pixelflinger from recovery"

* commit 'c91612d4668688c5d7bf76c258c11010697a03d2':
remove pixelflinger from recovery
7003ff3b54e9081dba92ecfea0594355af40e6dd 12-Mar-2014 Doug Zongker <dougz@android.com> am 8f087d02: Merge "update tools for making recovery images"

* commit '8f087d024619467de8609656e8a14370f24b817c':
update tools for making recovery images
aa6b8026ed5ae32f10b948edd26e3f489ba20751 12-Mar-2014 Doug Zongker <dougz@android.com> am 59508993: Merge "allow CheckKey to request mounting /system"

* commit '5950899369b712f66aa56c857c66ed1b6741f0e0':
allow CheckKey to request mounting /system
c15b7865badc3ac406a7ce978baa65151a50bb55 12-Mar-2014 Doug Zongker <dougz@google.com> resolved conflicts for merge of ea868b38 to klp-modular-dev-plus-aosp

Change-Id: I8cc3b8101bccf7fd697f9a7b73732d1000dc27a1
a7266ef0b1804e3ddeea58bda9a416e807a55f88 12-Mar-2014 Doug Zongker <dougz@android.com> Merge "separate fbdev-specific code out from minui"
5290f2087a314506e2926edd9640cf1feb793866 11-Mar-2014 Doug Zongker <dougz@android.com> separate fbdev-specific code out from minui

Isolate the code that interacts with fbdev, in preparation for adding
a new backend.

Change-Id: I19105e9da1ca6408cebc110f7e2bb5abfb481ee9
inui/Android.mk
inui/graphics.c
inui/graphics.h
inui/graphics_fbdev.c
inui/minui.h
c91612d4668688c5d7bf76c258c11010697a03d2 11-Mar-2014 Doug Zongker <dougz@android.com> Merge "remove pixelflinger from recovery"
16f97c3961f08e5db7930d99e592f0a9f752df46 07-Mar-2014 Doug Zongker <dougz@android.com> 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
ndroid.mk
inui/graphics.c
inui/minui.h
inui/resources.c
tdutils/flash_image.c
creen_ui.cpp
8f087d024619467de8609656e8a14370f24b817c 11-Mar-2014 Doug Zongker <dougz@android.com> Merge "update tools for making recovery images"
3ceeb580eb47419ce1c74d54c226a1a70ff2332f 11-Mar-2014 Doug Zongker <dougz@android.com> 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
nterlace-frames.py
ake-overlay.py
5950899369b712f66aa56c857c66ed1b6741f0e0 11-Mar-2014 Doug Zongker <dougz@android.com> Merge "allow CheckKey to request mounting /system"
4db31d20c92d093e1bdc9499aeeddc1adc19b209 04-Sep-2013 Doug Zongker <dougz@android.com> 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
ndroid.mk
i.cpp
i.h
ea868b3846794cd36424f477503377ea9348137a 11-Mar-2014 Doug Zongker <dougz@android.com> Merge "change how recovery animation is implemented"
469954fe3d7c3d729e500512ab911a037b90cc77 07-Mar-2014 Doug Zongker <dougz@android.com> change how recovery animation is implemented

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
inui/minui.h
inui/resources.c
es/images/icon_installing.png
es/images/icon_installing_overlay01.png
es/images/icon_installing_overlay02.png
es/images/icon_installing_overlay03.png
es/images/icon_installing_overlay04.png
es/images/icon_installing_overlay05.png
es/images/icon_installing_overlay06.png
es/images/icon_installing_overlay07.png
es/images/indeterminate01.png
es/images/indeterminate02.png
es/images/indeterminate03.png
es/images/indeterminate04.png
es/images/indeterminate05.png
es/images/indeterminate06.png
creen_ui.cpp
creen_ui.h
18f72dc551835ca6732ebaa7031c1f6b81f20329 11-Mar-2014 Doug Zongker <dougz@android.com> Merge "separate fbdev-specific code out from minui"
830b3e33634391e8f7264e5567acf0b510ea2d19 11-Mar-2014 Doug Zongker <dougz@android.com> separate fbdev-specific code out from minui

Isolate the code that interacts with fbdev, in preparation for adding
a new backend.

Change-Id: I19105e9da1ca6408cebc110f7e2bb5abfb481ee9
inui/Android.mk
inui/graphics.c
inui/graphics.h
inui/graphics_fbdev.c
inui/minui.h
5120c9fbb60d6625ec2588d77f13953884bb1a93 11-Mar-2014 Doug Zongker <dougz@android.com> 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: I79443f125f9c7d8d61cd09e3434745e0ef38893f
nterlace-frames.py
ake-overlay.py
39cf417e17011a72dd39acfe4cc8c90af26bdbaf 07-Mar-2014 Doug Zongker <dougz@android.com> 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
ndroid.mk
inui/graphics.c
inui/minui.h
inui/resources.c
tdutils/flash_image.c
creen_ui.cpp
be7eea0a880ed266bb4111dcc3a2159fdb8791d5 11-Mar-2014 Doug Zongker <dougz@android.com> am 2f173bde: Merge "ADB sideload command not work"

* commit '2f173bde6584f4c560ecc3f13f6e890f52815050':
ADB sideload command not work
7f1f286f45c7dd01f1056389690dbd8ab527855d 08-Mar-2014 Benoit Goby <benoit@android.com> am ac189bf6: Merge "recovery: Fix adb with linux 3.10"

* commit 'ac189bf645123b4dc79cd2053f5eb07917774d66':
recovery: Fix adb with linux 3.10
eac881c952fc6be0beeb5f719e3a70e651f3610e 07-Mar-2014 Doug Zongker <dougz@android.com> change how recovery animation is implemented

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
inui/minui.h
inui/resources.c
es/images/icon_installing.png
es/images/icon_installing_overlay01.png
es/images/icon_installing_overlay02.png
es/images/icon_installing_overlay03.png
es/images/icon_installing_overlay04.png
es/images/icon_installing_overlay05.png
es/images/icon_installing_overlay06.png
es/images/icon_installing_overlay07.png
es/images/indeterminate01.png
es/images/indeterminate02.png
es/images/indeterminate03.png
es/images/indeterminate04.png
es/images/indeterminate05.png
es/images/indeterminate06.png
creen_ui.cpp
creen_ui.h
a8554c71a358810176c7d70f6009d02d642fcc09 07-Mar-2014 Colin Cross <ccross@android.com> am a5d105e2: Merge "recovery: fix building with pointer-to-int errors turned on"

* commit 'a5d105e2397d81537facd93fd8a9d3e263d57dc9':
recovery: fix building with pointer-to-int errors turned on
182c1df40a3af36eca4ff0106a26a93f5744a56e 04-Mar-2014 Doug Zongker <dougz@android.com> Merge "support don't-care maps when writing the system image"
a8c56072ecf826d5a1c49ea8d180092e7d6496e9 03-Mar-2014 Paul Lawrence <paullawrence@google.com> Fix build break caused by vold change

cryptfs.h now includes sha header from libcrypto folder

Change-Id: Icd02c88971aedf96040c3bd9ca759e531546023b
ndroid.mk
a47996c6a34f796c551ab1db1e93c0a725c2aaee 26-Feb-2014 Doug Zongker <dougz@android.com> am 49968f09: am 2f173bde: Merge "ADB sideload command not work"

* commit '49968f0903eb69b1505bc99926344aacee4e81b6':
ADB sideload command not work
49968f0903eb69b1505bc99926344aacee4e81b6 26-Feb-2014 Doug Zongker <dougz@android.com> am 2f173bde: Merge "ADB sideload command not work"

* commit '2f173bde6584f4c560ecc3f13f6e890f52815050':
ADB sideload command not work
2f173bde6584f4c560ecc3f13f6e890f52815050 26-Feb-2014 Doug Zongker <dougz@android.com> Merge "ADB sideload command not work"
c9d6e4ff514b91b0ef08facb4dd480f166beae84 25-Feb-2014 Doug Zongker <dougz@android.com> support don't-care maps when writing the system image

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
pdater/install.c
0d372a553ee7d8ce8cbb7cfc41af0895d89661d1 21-Feb-2014 Benoit Goby <benoit@android.com> am ed75be6d: am ac189bf6: Merge "recovery: Fix adb with linux 3.10"

* commit 'ed75be6de9d883a2524065940d732593fa26ac19':
recovery: Fix adb with linux 3.10
ed75be6de9d883a2524065940d732593fa26ac19 20-Feb-2014 Benoit Goby <benoit@android.com> am ac189bf6: Merge "recovery: Fix adb with linux 3.10"

* commit 'ac189bf645123b4dc79cd2053f5eb07917774d66':
recovery: Fix adb with linux 3.10
ac189bf645123b4dc79cd2053f5eb07917774d66 20-Feb-2014 Benoit Goby <benoit@android.com> Merge "recovery: Fix adb with linux 3.10"
0ac1cbaa76f1ab88ed575b197b06d042e015c10e 20-Feb-2014 Doug Zongker <dougz@android.com> add flag for GPL license

updater now depends on the GPL'd libraries libsyspatch and libxdelta3,
so be careful when taking code from this directory.

Change-Id: Ib6f8c50ce7052912b9d81ff96d095f778bf9a3d0
pdater/MODULE_LICENSE_GPL
pdater/NOTICE
1b9641127c539c73cf97d7a69fa917838043db92 20-Feb-2014 Benoit Goby <benoit@android.com> 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
tc/init.rc
f2ff0a2097cd945a612fb461741b803d2b5aca7a 18-Feb-2014 Doug Zongker <dougz@android.com> Merge "clean up some warnings when building recovery"
48f4c3d60c9679d2cb6cd2931c2bc1138f3777cb 14-Feb-2014 Maxim Siniavine <siniavine@google.com> Merge "Fix a crash when going into recovery mode."
e7b288824589b2828d83e1d47f6f12b0bd0fb353 14-Feb-2014 Maxim Siniavine <siniavine@google.com> Fix a crash when going into recovery mode.

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
ncrypt/uncrypt.c
3eb681d1de4eb0a4807e851c323568ed3f360381 14-Feb-2014 Doug Zongker <dougz@android.com> remove remaining libminelf references

Change-Id: Id38b08607829bccc031693cc03e60e849903b6f8
pplypatch/Android.mk
pdater/Android.mk
0d32f259cddeaf46917bdc4af3514114c206dd76 14-Feb-2014 Doug Zongker <dougz@android.com> clean up some warnings when building recovery

Change-Id: I1541534ee6978ddf8d548433986679ce9507d508
ndroid.mk
dify/Android.mk
dify/expr.c
dify/expr.h
dify/main.c
dify/parser.y
ecovery.cpp
pdater/Android.mk
pdater/install.c
pdater/updater.c
a1bc148c7c81f886426c253f2ea7beb0f301f6b0 14-Feb-2014 Doug Zongker <dougz@android.com> remove 'retouch' ASLR support

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
ndroid.mk
pplypatch/applypatch.c
pplypatch/applypatch.h
pplypatch/main.c
inelf/Android.mk
inelf/Retouch.c
inelf/Retouch.h
pdater/install.c
52b4036eb820042d0309b32b579c52b63ca58b4d 11-Feb-2014 Doug Zongker <dougz@android.com> add syspatch support to updater

Add the syspatch() function, which can apply xdelta3+xz patches using
the libsyspatch library.

Change-Id: Idc1921e449020923bcaf425a1983bec0833e47ed
pdater/Android.mk
pdater/install.c
a9300301ce0bddb6f46e1e1a7499c13b615713c6 10-Feb-2014 Doug Zongker <dougz@android.com> add mzGetStoredEntry function

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
inzip/Zip.c
inzip/Zip.h
707d321a8745accf4660bf77e33f6acb9ce6b779 06-Feb-2014 Colin Cross <ccross@android.com> am 2739ed96: am a5d105e2: Merge "recovery: fix building with pointer-to-int errors turned on"

* commit '2739ed9628f72813d213b7a429c4c1b8dcebe5fc':
recovery: fix building with pointer-to-int errors turned on
2739ed9628f72813d213b7a429c4c1b8dcebe5fc 06-Feb-2014 Colin Cross <ccross@android.com> am a5d105e2: Merge "recovery: fix building with pointer-to-int errors turned on"

* commit 'a5d105e2397d81537facd93fd8a9d3e263d57dc9':
recovery: fix building with pointer-to-int errors turned on
a5d105e2397d81537facd93fd8a9d3e263d57dc9 06-Feb-2014 Colin Cross <ccross@android.com> Merge "recovery: fix building with pointer-to-int errors turned on"
92cdf9c37225c6f76b96c8f137896cd9e9015bbd 06-Feb-2014 Colin Cross <ccross@android.com> 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
inadbd/services.c
inui/graphics.c
inzip/Zip.c
4068f6aff2f898c55e6f8f3e2c92eefbb9189524 27-Jan-2014 Colin Cross <ccross@android.com> am fd84f65d: am f3532072: Merge "minadbd: remove dead code"

* commit 'fd84f65dcda3c7e4b42c71a7df85efebdbf7ea7a':
minadbd: remove dead code
fd84f65dcda3c7e4b42c71a7df85efebdbf7ea7a 27-Jan-2014 Colin Cross <ccross@android.com> am f3532072: Merge "minadbd: remove dead code"

* commit 'f353207298ed14d0e6943353dd9788421a7537b8':
minadbd: remove dead code
f353207298ed14d0e6943353dd9788421a7537b8 27-Jan-2014 Colin Cross <ccross@android.com> Merge "minadbd: remove dead code"
e787fee8f28d7cf6ab15635671ec46b1ce6bc87d 24-Jan-2014 Colin Cross <ccross@android.com> minadbd: remove dead code

Change-Id: Ia1f34a17ae582575f8cd3514ed7bc015b0a5006e
inadbd/adb.h
inadbd/transport.c
4d1b0903ff85769efd50d7bd02775b5861c31fbb 24-Jan-2014 Nick Kralevich <nnk@google.com> am f4641299: am 295e74aa: Merge "adbd: switch to su domain when running as root"

* commit 'f464129950eaea49b1234fdcfd04ec8723e3c672':
adbd: switch to su domain when running as root
f464129950eaea49b1234fdcfd04ec8723e3c672 24-Jan-2014 Nick Kralevich <nnk@google.com> am 295e74aa: Merge "adbd: switch to su domain when running as root"

* commit '295e74aa20c9f32e1e46fc1b0bf0975642a8c95b':
adbd: switch to su domain when running as root
295e74aa20c9f32e1e46fc1b0bf0975642a8c95b 24-Jan-2014 Nick Kralevich <nnk@google.com> Merge "adbd: switch to su domain when running as root"
19a8e2463c31a97121c35b4666a8e6879fa7e338 21-Jan-2014 Doug Zongker <dougz@android.com> log extra info for debugging

Make recovery log its PID, and when we use a block map file, log how
many ranges it contains.

Change-Id: I1b4299f8163af68a770b48c029ae25e6cb45d26b
inzip/SysUtil.c
ecovery.cpp
c52c5b8e3d690201b2ae009a2d396d1899033e3d 18-Jan-2014 Nick Kralevich <nnk@google.com> 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
tc/init.rc
65ad928602479379187d6fbe1d924f0fd60bea0e 17-Jan-2014 Da Zhou <dza@broadcom.com> 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>
inadbd/adb.c
inadbd/adb.h
inadbd/usb_linux_client.c
76adfc5309936a07218ce53b5ab284d5746fa84c 13-Jan-2014 Doug Zongker <dougz@android.com> program to store unencrypted files in an encrypted filesystem

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
ndroid.mk
ncrypt/Android.mk
ncrypt/uncrypt.c
99916f0496cfe37891d40f21a9a0e387620a8a60 13-Jan-2014 Doug Zongker <dougz@android.com> do verification and extraction on memory, not files

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
ndroid.mk
nstall.cpp
inzip/SysUtil.c
inzip/SysUtil.h
inzip/Zip.c
inzip/Zip.h
oots.cpp
pdater/updater.c
erifier.cpp
erifier.h
erifier_test.cpp
0708239c003a1537c9cbf98dea5a490955d667aa 14-Jan-2014 Doug Zongker <dougz@google.com> am a01b6467: am 772f6e2a: Merge "correctly mount tmpfs as /tmp in recovery"

* commit 'a01b646794fc207da657d7b8ef779c9d842acfde':
correctly mount tmpfs as /tmp in recovery
a01b646794fc207da657d7b8ef779c9d842acfde 14-Jan-2014 Doug Zongker <dougz@google.com> am 772f6e2a: Merge "correctly mount tmpfs as /tmp in recovery"

* commit '772f6e2a8865934bb57aaeea8354a75a47ee753f':
correctly mount tmpfs as /tmp in recovery
772f6e2a8865934bb57aaeea8354a75a47ee753f 14-Jan-2014 Doug Zongker <dougz@google.com> Merge "correctly mount tmpfs as /tmp in recovery"
075ef327d494ea1ce07eb038fcc367fb78b14500 14-Jan-2014 Doug Zongker <dougz@google.com> 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
tc/init.rc
c22a444cdd631e2644996f52a13abb77acb46bc9 13-Jan-2014 Nick Kralevich <nnk@google.com> am 7e0d3066: am fc729512: Merge "Set SELinux security contexts correctly for init and services."

* commit '7e0d30667cf53a182525f87dd0c8cb0e2628a1ed':
Set SELinux security contexts correctly for init and services.
7e0d30667cf53a182525f87dd0c8cb0e2628a1ed 13-Jan-2014 Nick Kralevich <nnk@google.com> am fc729512: Merge "Set SELinux security contexts correctly for init and services."

* commit 'fc729512375c4f0d351f6f67f0d7f500ea1b9233':
Set SELinux security contexts correctly for init and services.
fc729512375c4f0d351f6f67f0d7f500ea1b9233 13-Jan-2014 Nick Kralevich <nnk@google.com> Merge "Set SELinux security contexts correctly for init and services."
2c9d5b2839307987812db8a939d88272b865bacc 13-Jan-2014 Stephen Smalley <sds@tycho.nsa.gov> 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>
tc/init.rc
2768efdf9fe67d179f6cb733e6541f04b6f2bf46 13-Jan-2014 Doug Zongker <dougz@android.com> remove dead code from minzip

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
inzip/SysUtil.c
inzip/SysUtil.h
f3819c271e34559b123bb6b52210923ef1b8f65a 04-Jan-2014 Nick Kralevich <nnk@google.com> am 27efc8f9: am 617d1cad: Merge "minui: do not use flexible array initialization"

* commit '27efc8f9d1711134051b45d28b2fc38bfb4c7dc6':
minui: do not use flexible array initialization
27efc8f9d1711134051b45d28b2fc38bfb4c7dc6 04-Jan-2014 Nick Kralevich <nnk@google.com> am 617d1cad: Merge "minui: do not use flexible array initialization"

* commit '617d1cadc6e0e1e9fd46e0e6a8505f6f7f56a5f7':
minui: do not use flexible array initialization
617d1cadc6e0e1e9fd46e0e6a8505f6f7f56a5f7 04-Jan-2014 Nick Kralevich <nnk@google.com> Merge "minui: do not use flexible array initialization"
7af6b7f2cc59f8477a915367f47127cc516e9fa2 27-Dec-2013 Michael Runge <mrunge@google.com> am 15f5fe1b: am f9dd42de: Merge "Don\'t abort on read_file if the file is missing." into klp-dev

* commit '15f5fe1bcd2bf18b07f89d0cc58dcffb5bc1f932':
Don't abort on read_file if the file is missing.
15f5fe1bcd2bf18b07f89d0cc58dcffb5bc1f932 27-Dec-2013 Michael Runge <mrunge@google.com> am f9dd42de: Merge "Don\'t abort on read_file if the file is missing." into klp-dev

* commit 'f9dd42de6034ab09f9fa649ed1fbea25bc05e598':
Don't abort on read_file if the file is missing.
f9dd42de6034ab09f9fa649ed1fbea25bc05e598 20-Dec-2013 Michael Runge <mrunge@google.com> Merge "Don't abort on read_file if the file is missing." into klp-dev
289ab0259992805db1230247a6b69f1032fd773b 20-Dec-2013 Doug Zongker <dougz@google.com> am e1bb2733: am 168724c3: fix unnecessarily slow writing of EMMC partitions

* commit 'e1bb2733f9261336f38a94dc9d93ed010a7cbc57':
fix unnecessarily slow writing of EMMC partitions
e1bb2733f9261336f38a94dc9d93ed010a7cbc57 20-Dec-2013 Doug Zongker <dougz@google.com> am 168724c3: fix unnecessarily slow writing of EMMC partitions

* commit '168724c31ad5241e157ebb35135a734fa075d53b':
fix unnecessarily slow writing of EMMC partitions
168724c31ad5241e157ebb35135a734fa075d53b 20-Dec-2013 Doug Zongker <dougz@google.com> 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
pplypatch/applypatch.c
6eed2247714967eb0ce913d7da782fa884a4c1bd 14-Dec-2013 Michael Runge <mrunge@google.com> Don't abort on read_file if the file is missing.

Change-Id: I85726bf736203d602428114145c3b98692580656
pdater/install.c
f39989a36d4724a4852e28b9dca3d372d3f7873d 12-Dec-2013 Doug Zongker <dougz@android.com> recovery: wipe encryption metadata along with data partition

This assumes that the metadata is correctly defined in fstab.
Which apparently some devices don't do.


Bug: 8766487
Bug: 12112624
Change-Id: I1b14b9d4c888e9348527984be3dce04bdd9f4de0
ndroid.mk
oots.cpp
a766c34f86ddecbdc61634eb582a2ebce8253dc5 03-Dec-2013 Doug Zongker <dougz@google.com> am d327c63a: am c87bab10: add the functions for multi-stage packages to updater

* commit 'd327c63af691a36fbf53866a3ae7ad27a43ebe3b':
add the functions for multi-stage packages to updater
d327c63af691a36fbf53866a3ae7ad27a43ebe3b 27-Nov-2013 Doug Zongker <dougz@google.com> am c87bab10: add the functions for multi-stage packages to updater

* commit 'c87bab101893e8322b49d7c8600e3367b20ab50a':
add the functions for multi-stage packages to updater
c87bab101893e8322b49d7c8600e3367b20ab50a 25-Nov-2013 Doug Zongker <dougz@google.com> 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
ootloader.h
ecovery.cpp
es/images/stage_empty.png
es/images/stage_fill.png
creen_ui.cpp
creen_ui.h
i.h
pdater/install.c
a0ecc8c4277c5c216915ee60b927aea972c95b25 07-Nov-2013 synergy dev <synergye@codefi.re> minui: do not use flexible array initialization

Avoiding the use of gnu extensions improves code portability

Change-Id: I441a49ce08b6ecb1d735ca453552fa92026c5016
inui/font_10x18.h
9fb676aa924b2ad1c1f2f8f44734b1ecd9f909dc 18-Nov-2013 Doug Zongker <dougz@android.com> Merge "Fix rare crash seen when dereferencing backgroundIcon[NONE]."
027429a34fd229d7546640bd5b629156da8dd0fd 17-Jul-2013 Alistair Strachan <alistair.strachan@imgtec.com> Restore default umask after forking for update-binary.

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
nstall.cpp
9b8ae8038be65c2ec236bc04590716fbcd5363f6 17-Jul-2013 Alistair Strachan <alistair.strachan@imgtec.com> Fix rare crash seen when dereferencing backgroundIcon[NONE].

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
creen_ui.cpp
9690e2b370f3f303ef75e1fd5c7fdbea8787d46a 08-Nov-2013 Michael Runge <mrunge@google.com> am 40dfc474: am c64e76c7: Merge "Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add." into klp-dev

* commit '40dfc474c457f5be24e204e6a0c657c97acb8f3c':
Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add.
40dfc474c457f5be24e204e6a0c657c97acb8f3c 08-Nov-2013 Michael Runge <mrunge@google.com> am c64e76c7: Merge "Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add." into klp-dev

* commit 'c64e76c75088b951f61a7f7bacf8af6eccd2ccfa':
Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add.
c64e76c75088b951f61a7f7bacf8af6eccd2ccfa 07-Nov-2013 Michael Runge <mrunge@google.com> Merge "Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add." into klp-dev
ce7ca7165bb263c91ca7616a21457032c645e23d 07-Nov-2013 Michael Runge <mrunge@google.com> Enable incremental builder to find files that moved, and
try to process them via patch + rename, instead of
delete + add.

b/11437930

Change-Id: I984349fbc9a8dac4379e00c0d66fc7d22c4eb834
pdater/install.c
92a4f94478d8fa3afdedf905dcab537f9b7a259d 17-Oct-2013 Ed Heyl <edheyl@google.com> am a370c0f7: am 3966c571: merge in klp-release (no-op)

* commit 'a370c0f7fe65d6f012902342249d3a84b474f277':
a370c0f7fe65d6f012902342249d3a84b474f277 17-Oct-2013 Ed Heyl <edheyl@google.com> am 3966c571: merge in klp-release (no-op)

* commit '3966c571a0c36a40a8142e70b1aa6de547ea6ec3':
3966c571a0c36a40a8142e70b1aa6de547ea6ec3 17-Oct-2013 Ed Heyl <edheyl@google.com> merge in klp-release (no-op)
9f6bfa302a4744271966d102d2f791127fdc7111 14-Oct-2013 Kenny Root <kroot@google.com> am fc7eab96: am f4a6ab27: Merge "Add support for ECDSA signatures"

* commit 'fc7eab961f9dc85ee88e8c37ca1dc31a7f7b8331':
Add support for ECDSA signatures
fc7eab961f9dc85ee88e8c37ca1dc31a7f7b8331 14-Oct-2013 Kenny Root <kroot@google.com> am f4a6ab27: Merge "Add support for ECDSA signatures"

* commit 'f4a6ab27b335b69fbc419a9c1ef263004b561265':
Add support for ECDSA signatures
f4a6ab27b335b69fbc419a9c1ef263004b561265 14-Oct-2013 Kenny Root <kroot@google.com> Merge "Add support for ECDSA signatures"
7a4adb5268ae71260c86788ccdeb7a699c80ee0a 09-Oct-2013 Kenny Root <kroot@google.com> 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
ndroid.mk
sn1_decoder.cpp
sn1_decoder.h
estdata/otasigned_ecdsa_sha256.zip
estdata/testkey_ecdsa.pk8
estdata/testkey_ecdsa.x509.pem
ests/Android.mk
ests/asn1_decoder_test.cpp
erifier.cpp
erifier.h
erifier_test.cpp
erifier_test.sh
a47beb5dac79b031ab477bf3de0c8a6d1f0ce64b 09-Oct-2013 Ed Heyl <edheyl@google.com> am 053c1c5e: am 7fdeb1f9: merge in KQS81M

* commit '053c1c5e89136bd78c39c9e4a300d95f1cb3772d':
Don't apply permission changes to symlink.
recovery: fix use of init reboot method
053c1c5e89136bd78c39c9e4a300d95f1cb3772d 09-Oct-2013 Ed Heyl <edheyl@google.com> am 7fdeb1f9: merge in KQS81M

* commit '7fdeb1f9d7c1e979ebf78725bbf000bcb8c6ffc3':
Don't apply permission changes to symlink.
recovery: fix use of init reboot method
7fdeb1f9d7c1e979ebf78725bbf000bcb8c6ffc3 09-Oct-2013 Ed Heyl <edheyl@google.com> merge in KQS81M
91321f60ae3ac485ae63284a2121c728c8b52b95 03-Oct-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
f0af761369c5352f8ef9cd3c7a0db542924ef215 03-Oct-2013 Michael Runge <mrunge@google.com> am efef45ed: am a2a1ce82: Allow child classes to override the overlay location for the update image.

* commit 'efef45ede6f7588bd3f584d7746ca9822ade58ac':
Allow child classes to override the overlay location for the update image.
efef45ede6f7588bd3f584d7746ca9822ade58ac 03-Oct-2013 Michael Runge <mrunge@google.com> am a2a1ce82: 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.
a2a1ce823b8c76451ee2b38155b347b0c2ced714 03-Oct-2013 Michael Runge <mrunge@google.com> Allow child classes to override the overlay location for the
update image.

b/10952479

Change-Id: I59bb834f271f702fb529054dab7926b816fa35cc
creen_ui.h
80a7a4642be31db7ecd5eaa9e62b78deaa461146 31-Aug-2013 Bjorn Andersson <bjorn.andersson@sonymobile.com> 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
creen_ui.cpp
58207b84d31c6c281aebf9384024203eadea5316 26-Sep-2013 Doug Zongker <dougz@android.com> fix use of RGBA images in minui

Bug: 10934401
Change-Id: I471b30e5b2e877c620e4a0a524e950cddbc6d2c0
inui/resources.c
bb83e14c49964cb0c6e6d598fda10a0ca66d1006 25-Sep-2013 Kenny Root <kroot@android.com> am dd92a4d6: am 58c60900: Merge "verifier: update to support certificates using SHA-256"

* commit 'dd92a4d625a6735651efeb12a5707620bc5c6339':
verifier: update to support certificates using SHA-256
dd92a4d625a6735651efeb12a5707620bc5c6339 25-Sep-2013 Kenny Root <kroot@android.com> am 58c60900: Merge "verifier: update to support certificates using SHA-256"

* commit '58c60900ac3682fab08f64373bdd1020713b48f7':
verifier: update to support certificates using SHA-256
58c60900ac3682fab08f64373bdd1020713b48f7 25-Sep-2013 Kenny Root <kroot@android.com> Merge "verifier: update to support certificates using SHA-256"
30362a6ad132cbafde82cc57293e00679d4f86c2 10-Apr-2013 Doug Zongker <dougz@android.com> verifier: update to support certificates using SHA-256

(cherry picked from commit bac7fba02763ae5e78e8e4ba0bea727330ad953e)

Change-Id: I01c38d7fea088622a8b0bbf2c833fa2d969417af
pplypatch/applypatch.c
nstall.cpp
estdata/otasigned_f4_sha256.zip
estdata/otasigned_sha256.zip
estdata/test_f4_sha256.x509.pem
estdata/testkey.pk8
estdata/testkey.x509.pem
estdata/testkey_sha256.x509.pem
pdater/install.c
erifier.cpp
erifier.h
erifier_test.cpp
erifier_test.sh
0ca7e00da7ec7ae61d75f4e2d417bf9301bde3de 18-Sep-2013 Nick Kralevich <nnk@google.com> am 46ab1b61: updater: Delete dead code

* commit '46ab1b6138bf911120280f1095ff9479dceee3df':
updater: Delete dead code
a5ef19fabd10428ccff2055455ef1a55dfdc5fa0 17-Sep-2013 Todd Poynor <toddpoynor@google.com> recovery: fix epoll events type to uint32_t

Change-Id: I5db9987102201c18821acb45d1f824e9865a1451
inui/events.c
inui/minui.h
i.cpp
i.h
46ab1b6138bf911120280f1095ff9479dceee3df 11-Sep-2013 Nick Kralevich <nnk@google.com> updater: Delete dead code

set_perm and set_perm_recursive are no longer used. Delete.

(cherry picked from commit 08ef9a957027183dcf55e432441e8fb0d5299aba)

Change-Id: I1bcc90ae19af9df4f0705496c5876987159f75ac
inzip/DirUtil.c
inzip/DirUtil.h
pdater/install.c
be96809d181f587255176add2aa298adaaec69e4 14-Sep-2013 Todd Poynor <toddpoynor@google.com> start healthd in recovery mode

Change-Id: I431ece69b6856fd1ea6079c38cdeb593c15d7385
tc/init.rc
4665ede960301144eeebcf6b145ac83fd9d2c778 11-Sep-2013 Todd Poynor <toddpoynor@google.com> minui: add ev_get_epollfd() to retrieve epoll file descriptor

To allow use of ev_* functions with an external main loop.

Change-Id: If73717b64d7c455ca726b90a815a31c1edf52544
inui/events.c
inui/minui.h
e7265df3523d27c9f59829c858de256cf063da26 11-Sep-2013 Todd Poynor <toddpoynor@google.com> recovery: ui changes for ev_*() switch to epoll

Convert callback events parameter to unsigned int.

Change-Id: Ife0e983f307c07bf4aca807d70574aeb20c460cd
i.cpp
i.h
1fc89d4c84e512b484d82d971d997bdb0aef40e2 11-Sep-2013 Todd Poynor <toddpoynor@google.com> minui: convert ev_*() event interface to epoll

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
inui/events.c
inui/minui.h
c287321e9c8dbe92bd8d5081487fb2eea7680ac3 12-Sep-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
743e24f161f84553f4890c141d935ceb5224d38a 12-Sep-2013 Doug Zongker <dougz@google.com> am 1306a7ef: am cc2958fd: fix secure adb in recovery

* commit '1306a7effafab77cf2769091619518c2ab263ee8':
fix secure adb in recovery
1306a7effafab77cf2769091619518c2ab263ee8 11-Sep-2013 Doug Zongker <dougz@google.com> am cc2958fd: fix secure adb in recovery

* commit 'cc2958fd7f32f79d1a034eee005e04afeb310a87':
fix secure adb in recovery
cc2958fd7f32f79d1a034eee005e04afeb310a87 11-Sep-2013 Doug Zongker <dougz@google.com> 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
tc/init.rc
08ef9a957027183dcf55e432441e8fb0d5299aba 11-Sep-2013 Nick Kralevich <nnk@google.com> updater: Delete dead code

set_perm and set_perm_recursive are no longer used. Delete.

Change-Id: I3bb40b934b6c093b24b88aa4ed6f3c7de2bb52f0
inzip/DirUtil.c
inzip/DirUtil.h
pdater/install.c
d456944f02cf41af63f4a32a974721c8dd6a0f66 11-Sep-2013 Nick Kralevich <nnk@google.com> Don't apply permission changes to symlink.

Bug: 10183961
Bug: 10186213
Bug: 8985290
Change-Id: I57cb14af59682c5f25f1e091564548bdbf20f74e
pdater/install.c
53e8f3091849e80585044dfff4a7075c26936543 11-Sep-2013 Nick Kralevich <nnk@google.com> am af677d78: am e461251e: Don\'t apply permission changes to symlink.

* commit 'af677d786e6333187ccbd4f7fe6f371a09b71645':
Don't apply permission changes to symlink.
af677d786e6333187ccbd4f7fe6f371a09b71645 11-Sep-2013 Nick Kralevich <nnk@google.com> am e461251e: Don\'t apply permission changes to symlink.

* commit 'e461251e2caa5561cf6a315bffaebfd4eb896b1d':
Don't apply permission changes to symlink.
e461251e2caa5561cf6a315bffaebfd4eb896b1d 11-Sep-2013 Nick Kralevich <nnk@google.com> Don't apply permission changes to symlink.

Bug: 10183961
Bug: 10186213
Bug: 8985290
Change-Id: I57cb14af59682c5f25f1e091564548bdbf20f74e
pdater/install.c
c4a3a4bcc8cf342435b038bcfa76d94f4c015654 10-Sep-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
c724eee5927c3bd47c1c9870b2e02536bd51a22c 10-Sep-2013 Nick Kralevich <nnk@google.com> am cc421662: am 5dbdef0e: updater: introduce and set_metadata and set_metadata_recursive

* commit 'cc421662d7f9b68627204b8c8bfb4a5cada74125':
updater: introduce and set_metadata and set_metadata_recursive
863f4ef587fad3c7263fc5bb66e69d088307f154 10-Sep-2013 Nick Kralevich <nnk@google.com> am 5ae88e89: am 3328e3bc: Revert "Update OTA installer to understand SELinux filesystem labels"

* commit '5ae88e899836e7e3350db55ac47aee6f219cf126':
Revert "Update OTA installer to understand SELinux filesystem labels"
cc421662d7f9b68627204b8c8bfb4a5cada74125 10-Sep-2013 Nick Kralevich <nnk@google.com> am 5dbdef0e: updater: introduce and set_metadata and set_metadata_recursive

* commit '5dbdef0e5b8a841fadc64d016d10ce81a962b284':
updater: introduce and set_metadata and set_metadata_recursive
5ae88e899836e7e3350db55ac47aee6f219cf126 10-Sep-2013 Nick Kralevich <nnk@google.com> am 3328e3bc: Revert "Update OTA installer to understand SELinux filesystem labels"

* commit '3328e3bc81161c2a57ea94d304162276facdd826':
Revert "Update OTA installer to understand SELinux filesystem labels"
5dbdef0e5b8a841fadc64d016d10ce81a962b284 07-Sep-2013 Nick Kralevich <nnk@google.com> 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
pdater/install.c
3328e3bc81161c2a57ea94d304162276facdd826 09-Sep-2013 Nick Kralevich <nnk@google.com> Revert "Update OTA installer to understand SELinux filesystem labels"

This reverts commit 627eb30f73c29257acaeb6568f3da38880784f7c.

Bug: 10183961
Bug: 10186213
inzip/DirUtil.c
inzip/DirUtil.h
pdater/install.c
9e805d6ca0101f6bfc458e5c1e9b48fecb495a72 04-Sep-2013 Doug Zongker <dougz@android.com> 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
ndroid.mk
i.cpp
i.h
15ae0e7867507f3bde3cd7061fbad933d1fe059c 03-Sep-2013 Doug Zongker <dougz@google.com> 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
ecovery.cpp
e428f624653bd0b6f66e8d4c95f54f6e90fc6218 03-Sep-2013 Doug Zongker <dougz@google.com> am f187a543: am 3b5a987c: recovery: fix use of init reboot method

* commit 'f187a5438d5a0651c344038f2203469e193704f9':
recovery: fix use of init reboot method
f187a5438d5a0651c344038f2203469e193704f9 03-Sep-2013 Doug Zongker <dougz@google.com> am 3b5a987c: recovery: fix use of init reboot method

* commit '3b5a987cd7fd76c038e9875b430028216d21ace3':
recovery: fix use of init reboot method
3b5a987cd7fd76c038e9875b430028216d21ace3 03-Sep-2013 Doug Zongker <dougz@google.com> 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
ecovery.cpp
79a188cbcfacd898f01d071159b56b87c8612fbf 30-Aug-2013 Doug Zongker <dougz@google.com> am 366f78a9: am 77ea71d6: recovery: fix rebooting

* commit '366f78a9df45d6648746de8454655224b22c31fd':
recovery: fix rebooting
366f78a9df45d6648746de8454655224b22c31fd 30-Aug-2013 Doug Zongker <dougz@google.com> am 77ea71d6: recovery: fix rebooting

* commit '77ea71d6a85a93c9bf423466e87661b1bf67c512':
recovery: fix rebooting
77ea71d6a85a93c9bf423466e87661b1bf67c512 30-Aug-2013 Doug Zongker <dougz@google.com> 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
tc/init.rc
ecovery.cpp
f280bb5f763bb91fbaaee1a870de7ba9309472e3 27-Aug-2013 John Reck <jreck@android.com> am 19877de5: am 5c4e1dac: Merge "Update libpng API usage"

* commit '19877de513a9493dad77488144089b4f30103b74':
Update libpng API usage
19877de513a9493dad77488144089b4f30103b74 27-Aug-2013 John Reck <jreck@android.com> am 5c4e1dac: Merge "Update libpng API usage"

* commit '5c4e1dac0bd8f31559bd50eec4343b7a17b7a976':
Update libpng API usage
5c4e1dac0bd8f31559bd50eec4343b7a17b7a976 27-Aug-2013 John Reck <jreck@android.com> Merge "Update libpng API usage"
94fd07ba6d911a446d1d419ad188cbeccc76129a 27-Aug-2013 John Reck <jreck@google.com> Update libpng API usage

Remove usage of deprecated methods

Change-Id: I747568a2c8c0c65ecbc9a3da4bac7b9cac7708ab
inui/resources.c
c31ecb72f0ee2e18e9746f382b16a8723f1a68b8 22-Aug-2013 Doug Zongker <dougz@google.com> am 239ac6ab: recovery: install packages in a known mount environment

* commit '239ac6abac4524be93fce710360c0512c6cc2ab3':
recovery: install packages in a known mount environment
239ac6abac4524be93fce710360c0512c6cc2ab3 21-Aug-2013 Doug Zongker <dougz@google.com> 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
nstall.cpp
ecovery.cpp
oots.cpp
oots.h
creen_ui.cpp
41329c5fd09812ec7c53174f3a7cf67a49f23ce7 13-Aug-2013 John Reck <jreck@google.com> Fix libpng API usage

Remove usage of deprecated methods that were removed in 1.6

Change-Id: I2a669bf5201197f60adfdbe512fd729bebb74f9c
inui/resources.c
c0441d171914e59941ec4f815ae0aabf56d6504f 31-Jul-2013 Doug Zongker <dougz@android.com> notify about pending long press

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
ecovery.cpp
creen_ui.cpp
creen_ui.h
i.cpp
i.h
3c3ee3bc33d35cf3939f57f6c649459280b57827 27-Jul-2013 Todd Poynor <toddpoynor@google.com> Merge "start healthd in recovery"
627eb30f73c29257acaeb6568f3da38880784f7c 18-Jul-2013 Nick Kralevich <nnk@google.com> Update OTA installer to understand SELinux filesystem labels

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
inzip/DirUtil.c
inzip/DirUtil.h
pdater/install.c
51c84694b0198a90b8eed635b46a3712c44db7a5 11-Jul-2013 Doug Zongker <dougz@android.com> am a69b50c5: am 901b898d: recovery: remove O_DIRECT, use O_SYNC only

* commit 'a69b50c567d46afad73c4d6ab9e57f078ee73327':
recovery: remove O_DIRECT, use O_SYNC only
bce44d8b550d898ab1893cc0125b18f29534a0ec 11-Jul-2013 Doug Zongker <dougz@android.com> am 660637f3: am e8d953aa: recovery: more cargo-cult programming

* commit '660637f3fc6fe20e8b7f47b98152138c2c92b7ec':
recovery: more cargo-cult programming
a69b50c567d46afad73c4d6ab9e57f078ee73327 11-Jul-2013 Doug Zongker <dougz@android.com> am 901b898d: recovery: remove O_DIRECT, use O_SYNC only

* commit '901b898d5e4d7cc555974b8132f83f948f8fbaee':
recovery: remove O_DIRECT, use O_SYNC only
901b898d5e4d7cc555974b8132f83f948f8fbaee 11-Jul-2013 Doug Zongker <dougz@android.com> recovery: remove O_DIRECT, use O_SYNC only

O_DIRECT writes fail with EINVAL due to alignment issues.

Change-Id: If8cf38a636313e4f4b4e61e66287dc903c473e5b
pplypatch/applypatch.c
660637f3fc6fe20e8b7f47b98152138c2c92b7ec 11-Jul-2013 Doug Zongker <dougz@android.com> am e8d953aa: recovery: more cargo-cult programming

* commit 'e8d953aa7ed0c16beb1b03a05d16cb23dd85e198':
recovery: more cargo-cult programming
e8d953aa7ed0c16beb1b03a05d16cb23dd85e198 11-Jul-2013 Doug Zongker <dougz@android.com> recovery: more cargo-cult programming

Add O_DIRECT|O_SYNC when opening partitions for write.

Change-Id: I9825ad8e60fba87e482f8abc5593d6f54a1e3a1c
pplypatch/applypatch.c
1bdd5b7e744d20854d90cfead752eebcf9cde023 11-Jul-2013 The Android Open Source Project <initial-contribution@android.com> am 51ffaf54: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '51ffaf54a56441bba053d37a00122761c3a18f16':
recovery: sleep after writing partition and closing it
65c37aa0d328d7bb13d121bd59ab784361335bd8 11-Jul-2013 Doug Zongker <dougz@android.com> am fbcfad33: am bf4a69ac: recovery: sleep after writing partition and closing it

* commit 'fbcfad33face5d3b9e6b8cb04379168bceb517df':
recovery: sleep after writing partition and closing it
f5edbd107a234e989a6d765046c13293842b66cc 11-Jul-2013 The Android Open Source Project <initial-contribution@android.com> am e352c88f: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'e352c88fbcfd917f6614597364d2e550aa691e79':
recovery: write partitions more conservatively
recovery: try to write EMMC partitions more reliably
5d0da128789c229ef723f21b4f620bde4db9d9d2 11-Jul-2013 Doug Zongker <dougz@android.com> am 2148133d: am c870a99c: recovery: write partitions more conservatively

* commit '2148133d46cb875316b01947dd5719ed995f7d67':
recovery: write partitions more conservatively
51ffaf54a56441bba053d37a00122761c3a18f16 11-Jul-2013 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr2-release - do not merge

Change-Id: Id35004f465f5152c1de0796eb66989f234185208
166565f9fb3034f7e7f60f6614cff754d94a4078 10-Jul-2013 Doug Zongker <dougz@android.com> recovery: sleep after writing partition and closing it

Another speculative attempt to get everything we write actually stored
to the device.

Change-Id: Icf40b0741b4c535e55ea34848073a97d90dc0e70
pplypatch/applypatch.c
fbcfad33face5d3b9e6b8cb04379168bceb517df 10-Jul-2013 Doug Zongker <dougz@android.com> am bf4a69ac: recovery: sleep after writing partition and closing it

* commit 'bf4a69ac41696fe78f6cc67b10cf1816186f1c5d':
recovery: sleep after writing partition and closing it
bf4a69ac41696fe78f6cc67b10cf1816186f1c5d 10-Jul-2013 Doug Zongker <dougz@android.com> recovery: sleep after writing partition and closing it

Another speculative attempt to get everything we write actually stored
to the device.

Change-Id: Icf40b0741b4c535e55ea34848073a97d90dc0e70
pplypatch/applypatch.c
e352c88fbcfd917f6614597364d2e550aa691e79 10-Jul-2013 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr2-release - do not merge

Change-Id: Ib99b7cd6aede63006c91be2635112e16dd0f2b24
c6ab95e9d17fd174df1dd07076fbf6251480ba09 09-Jul-2013 Doug Zongker <dougz@android.com> 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
pplypatch/applypatch.c
35c474e8c0c6dcbdb10e6065184ed4516228d9dd 08-Jul-2013 Doug Zongker <dougz@android.com> 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
pplypatch/applypatch.c
pplypatch/applypatch.h
a4ee1f8b76a11ea3dc31aad6a0d5d1e9f11904e6 09-Jul-2013 Doug Zongker <dougz@android.com> Merge "recovery: preserve recovery logs across cache wipes"
6d0d7ac051a0338c0e07e239e742b92e5ab8ea07 09-Jul-2013 Doug Zongker <dougz@android.com> recovery: preserve recovery logs across cache wipes

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
ecovery.cpp
fafc85b4ad7a5679c6b562bed64460732e05fd1e 09-Jul-2013 Doug Zongker <dougz@android.com> recovery: move log output to stdout

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
dify/expr.c
dify/main.c
nstall.cpp
inui/graphics.c
tdutils/mtdutils.c
ecovery.cpp
pdater/install.c
pdater/updater.c
2148133d46cb875316b01947dd5719ed995f7d67 09-Jul-2013 Doug Zongker <dougz@android.com> am c870a99c: recovery: write partitions more conservatively

* commit 'c870a99c4aeb9e232ee68951e666b5fa670d1680':
recovery: write partitions more conservatively
c870a99c4aeb9e232ee68951e666b5fa670d1680 09-Jul-2013 Doug Zongker <dougz@android.com> 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
pplypatch/applypatch.c
602c4ebd393845f3388aea6ecb0c620580a7f332 08-Jul-2013 Doug Zongker <dougz@android.com> am 0ccaccf7: am 044a0b4d: recovery: try to write EMMC partitions more reliably

* commit '0ccaccf7d0f50bb9555ee13a841c246a1fea80f2':
recovery: try to write EMMC partitions more reliably
573e830b27014ccc8f7c4e0e881279052e5826cf 08-Jul-2013 yetta_wu <yetta_wu@asus.com> am 4d4b233e: am 2f6877a0: recovery: init backgroundIcon properly to avoid recovery mode crash

* commit '4d4b233eae51d5580b58cb00d3aa45ecbb1b255e':
recovery: init backgroundIcon properly to avoid recovery mode crash
0ccaccf7d0f50bb9555ee13a841c246a1fea80f2 08-Jul-2013 Doug Zongker <dougz@android.com> am 044a0b4d: recovery: try to write EMMC partitions more reliably

* commit '044a0b4d49a11edfa13471ce20914b0514eb7e0e':
recovery: try to write EMMC partitions more reliably
044a0b4d49a11edfa13471ce20914b0514eb7e0e 08-Jul-2013 Doug Zongker <dougz@android.com> 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
pplypatch/applypatch.c
pplypatch/applypatch.h
5b468fc9305bf3adef681fa1e56364fc51761af8 25-Jun-2013 yetta_wu <yetta_wu@asus.com> 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>
creen_ui.cpp
f24fd7e8479d54eaa2b73db5a3a3ad076a13f72d 02-Jul-2013 Doug Zongker <dougz@android.com> recovery: copy logs to cache more aggressively

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
ecovery.cpp
4d4b233eae51d5580b58cb00d3aa45ecbb1b255e 25-Jun-2013 yetta_wu <yetta_wu@asus.com> am 2f6877a0: recovery: init backgroundIcon properly to avoid recovery mode crash

* commit '2f6877a0220475303907203308c018d789ea1a53':
recovery: init backgroundIcon properly to avoid recovery mode crash
2f6877a0220475303907203308c018d789ea1a53 25-Jun-2013 yetta_wu <yetta_wu@asus.com> 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>
creen_ui.cpp
2f2c98869b5391310965c7d154c68f4b28e0ccfb 04-Jun-2013 Todd Poynor <toddpoynor@google.com> start healthd in recovery

Change-Id: I16e3e0ddb8ca062431deb4be83c5be5eb786d76f
tc/init.rc
7839f64bafff349bff630df29cae11dfee05a1e5 04-Jun-2013 Doug Zongker <dougz@android.com> am 8cd12112: am d51bfc9b: Merge "Fix the potential segmentation fault"

* commit '8cd12112e444e01163526fe6ab237f6164b0018b':
Fix the potential segmentation fault
8cd12112e444e01163526fe6ab237f6164b0018b 04-Jun-2013 Doug Zongker <dougz@android.com> am d51bfc9b: Merge "Fix the potential segmentation fault"

* commit 'd51bfc9b1fe89321af3c629e7b23a747050332e1':
Fix the potential segmentation fault
d51bfc9b1fe89321af3c629e7b23a747050332e1 04-Jun-2013 Doug Zongker <dougz@android.com> Merge "Fix the potential segmentation fault"
93ffa7579cd75d1bdb2d124aa5cc5f8b6025e3d8 04-Jun-2013 Jin Feng <jin88.feng@gmail.com> 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>
ecovery.cpp
22bdc370b057884b4594c20f9f4164f3bf06dc30 21-May-2013 Doug Zongker <dougz@android.com> am da1ebaef: recovery: save logs from the last few invocations of recovery

* commit 'da1ebaef0aa8e38db6edf8bfc3d96290461a424f':
recovery: save logs from the last few invocations of recovery
4e021c56f317b32a94b8f7e4e87a463cc60bae25 21-May-2013 Doug Zongker <dougz@android.com> am 7c3ae45e: recovery: turn on text display for install errors in debug builds

* commit '7c3ae45ef9306d2ff4b491e0488c8849bf15ce90':
recovery: turn on text display for install errors in debug builds
da1ebaef0aa8e38db6edf8bfc3d96290461a424f 16-May-2013 Doug Zongker <dougz@android.com> 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
ecovery.cpp
7c3ae45ef9306d2ff4b491e0488c8849bf15ce90 14-May-2013 Doug Zongker <dougz@android.com> 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
ommon.h
ecovery.cpp
erifier_test.cpp
46bee63afcd1e2817cdc75a6a8cefdcfdc3e8429 16-May-2013 Doug Zongker <dougz@android.com> 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
ecovery.cpp
596b342a0476629badb41b840494254a19c57dae 14-May-2013 Doug Zongker <dougz@android.com> 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
ommon.h
ecovery.cpp
erifier_test.cpp
c7a6858dc9d4e75c9c889890902141c4243228a7 12-Apr-2013 Doug Zongker <dougz@android.com> Merge "verifier: update to support certificates using SHA-256"
bac7fba02763ae5e78e8e4ba0bea727330ad953e 10-Apr-2013 Doug Zongker <dougz@android.com> verifier: update to support certificates using SHA-256

Change-Id: Ifd5a29d459acf101311fa1c220f728c3d0ac2e4e
pplypatch/applypatch.c
nstall.cpp
estdata/otasigned_f4_sha256.zip
estdata/otasigned_sha256.zip
estdata/test_f4_sha256.x509.pem
estdata/testkey.pk8
estdata/testkey.x509.pem
estdata/testkey_sha256.x509.pem
pdater/install.c
erifier.cpp
erifier.h
erifier_test.cpp
erifier_test.sh
e5d37b409f61c8380ec684162b8a50aa571b9f3e 10-Apr-2013 Ying Wang <wangying@google.com> am 4e21482d: Add liblog

* commit '4e21482d979f6f81b34f92e664adf137555d4504':
Add liblog
4e21482d979f6f81b34f92e664adf137555d4504 10-Apr-2013 Ying Wang <wangying@google.com> Add liblog

Bug: 8580410
Change-Id: Ie60dade81c06589cb0daee431611ded34adef8e6
ndroid.mk
tdutils/Android.mk
pdater/Android.mk
84a6c0d298f0606f7c27857b17115cbd362ad637 11-Mar-2013 Jean-Baptiste Queru <jbq@google.com> am b5bd4fb7: (-s ours) am 2f50df00: am c09444eb: am f91bd41c: am 1c302caf: (-s ours) am c14a7fbd: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'b5bd4fb79544b1939e9f977a88a707bdc90cf66c':
b5bd4fb79544b1939e9f977a88a707bdc90cf66c 11-Mar-2013 Jean-Baptiste Queru <jbq@google.com> am 2f50df00: am c09444eb: am f91bd41c: am 1c302caf: (-s ours) am c14a7fbd: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '2f50df0058dff23fbdfc6b123bb92aaa90aea09b':
2f50df0058dff23fbdfc6b123bb92aaa90aea09b 11-Mar-2013 Jean-Baptiste Queru <jbq@google.com> am c09444eb: am f91bd41c: am 1c302caf: (-s ours) am c14a7fbd: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'c09444eb5b66a5702db99d9b7de23cb73bf11aa4':
c09444eb5b66a5702db99d9b7de23cb73bf11aa4 11-Mar-2013 Jean-Baptiste Queru <jbq@google.com> am f91bd41c: am 1c302caf: (-s ours) am c14a7fbd: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'f91bd41c46ec8bd085c361ea0bdf53efe13c87ca':
f91bd41c46ec8bd085c361ea0bdf53efe13c87ca 11-Mar-2013 Jean-Baptiste Queru <jbq@google.com> am 1c302caf: (-s ours) am c14a7fbd: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '1c302cafdd793ae250f767b88da718b916751feb':
1c302cafdd793ae250f767b88da718b916751feb 11-Mar-2013 Jean-Baptiste Queru <jbq@google.com> am c14a7fbd: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'c14a7fbd895aed1ce34c0682ece5ef361f21dd1c':
c14a7fbd895aed1ce34c0682ece5ef361f21dd1c 11-Mar-2013 Jean-Baptiste Queru <jbq@google.com> Reconcile with jb-mr1-release - do not merge
6fd59ac07d91eb373f4269a40e688aa82a6ccc6e 07-Mar-2013 Doug Zongker <dougz@android.com> more font improvements and cleanup

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
onts/12x22.png
onts/18x32.png
onts/OFL.txt
onts/README
inui/font_10x18.h
inui/graphics.c
inui/minui.h
ecovery.cpp
es/images/font.png
creen_ui.cpp
creen_ui.h
55a36ac1e01205f2cd461cd2f89d92e3b64cddd2 05-Mar-2013 Doug Zongker <dougz@android.com> recovery: change font for menus to be an image

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
inui/font_10x18.h
inui/graphics.c
inui/resources.c
es/images/font.png
creen_ui.cpp
869abf03e2b4d3d5e9b942fe165254969f0e5d9b 01-Mar-2013 Nick Kralevich <nnk@google.com> am ec838b88: Merge "minadbd: remove unnecessary header files."

* commit 'ec838b885dd8b74b8682dd2498c7da8f7afca291':
minadbd: remove unnecessary header files.
ec838b885dd8b74b8682dd2498c7da8f7afca291 01-Mar-2013 Nick Kralevich <nnk@google.com> Merge "minadbd: remove unnecessary header files."
05aa743493279f9637cf52581b9b4729c7141f1e 01-Mar-2013 Nick Kralevich <nnk@google.com> minadbd: remove unnecessary header files.

Change-Id: Iff2b53d9e63b279d0262cd2e9cfb11e0ca4d6b42
inadbd/adb.c
e729bac228cff119062be58f847f8bbda1f2599a 22-Feb-2013 Ben Murdoch <benm@google.com> Add a CleanSpec for bootable/recovery

Change-Id: Ifa7a3aa5e2e3fd5d13266115d592bbfd0aa309c5
leanSpec.mk
f35d1cef7c19db975a1295e8c23c7fb8bd2489f9 13-Feb-2013 Ken Sumrall <ksumrall@android.com> Move to using the new unified fstab in recovery.

Instead of reading it's own fstab, have recovery invoke
fs_mgr to read the unified fstab.

Change-Id: I80c75d2c53b809ac60a4a69f0ef7ebfa707c39e9
ndroid.mk
ootloader.cpp
ommon.h
oots.cpp
f087dfb52cb9a3a33b85b922fdaadf0514b37e46 09-Jan-2013 Ethan Yonker <ethanayonker@gmail.com> 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>
inadbd/services.c
133f56bde05c9202720541f92150951c20549675 03-Jan-2013 Doug Zongker <dougz@android.com> am f7d42340: am c560a67b: add optional overscan compensation to recovery graphics

* commit 'f7d423403d0aed6b8488559185e2246257abc58b':
add optional overscan compensation to recovery graphics
f7d423403d0aed6b8488559185e2246257abc58b 03-Jan-2013 Doug Zongker <dougz@android.com> am c560a67b: add optional overscan compensation to recovery graphics

* commit 'c560a67b12350102ba237fa70cedc7c972ad4e4b':
add optional overscan compensation to recovery graphics
c560a67b12350102ba237fa70cedc7c972ad4e4b 19-Dec-2012 Doug Zongker <dougz@android.com> 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
inui/Android.mk
inui/graphics.c
inui/minui.h
2ad5d91b1c1b631563f502a54de69ef6773a55db 18-Dec-2012 Doug Zongker <dougz@android.com> am 6a1d21a0: am bb01d0c1: add NextCheckKeyIsLong() and EnqueueKey() methods

* commit '6a1d21a0ceb1fb46e9113f3d2a81390612806dfd':
add NextCheckKeyIsLong() and EnqueueKey() methods
6a1d21a0ceb1fb46e9113f3d2a81390612806dfd 18-Dec-2012 Doug Zongker <dougz@android.com> am bb01d0c1: add NextCheckKeyIsLong() and EnqueueKey() methods

* commit 'bb01d0c12b29e6ff4a9169c21c95408e7eb882c5':
add NextCheckKeyIsLong() and EnqueueKey() methods
9da1880118c58e45543d9f3b2356e9f833582c9a 17-Dec-2012 Elliott Hughes <enh@google.com> am 9028fb4d: Merge "Pass the correct pointer to munmap on failure."

* commit '9028fb4d4ceed040c7d3ae9b1ceaa5a7472856ba':
Pass the correct pointer to munmap on failure.
9028fb4d4ceed040c7d3ae9b1ceaa5a7472856ba 17-Dec-2012 Elliott Hughes <enh@google.com> Merge "Pass the correct pointer to munmap on failure."
bb01d0c12b29e6ff4a9169c21c95408e7eb882c5 17-Dec-2012 Doug Zongker <dougz@android.com> 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
i.cpp
i.h
c86f22c131ef72bd3350720d2029766c4f0721f3 17-Dec-2012 Elliott Hughes <enh@google.com> 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
inzip/SysUtil.c
1fca2650edb5ae373a297b6029df5e250c021dd3 06-Nov-2012 The Android Open Source Project <initial-contribution@android.com> am 27f31606: (-s ours) am aa0dbb25: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '27f31606390eeed50d27f2c243dfbfe79e8b5ae2':
27f31606390eeed50d27f2c243dfbfe79e8b5ae2 06-Nov-2012 The Android Open Source Project <initial-contribution@android.com> am aa0dbb25: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'aa0dbb25a0ae51a8e53018fe05bf59164d9804cb':
aa0dbb25a0ae51a8e53018fe05bf59164d9804cb 06-Nov-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: Ibef4c059b7a7e055fe562c60656a9f7f7de4841a
6c249f7ae890694f061bfde7a3ab52bf367be110 02-Nov-2012 Doug Zongker <dougz@android.com> move key loading to verifier code

Add an option to verifier_test to load keys from a file, the way the
recovery does.

Change-Id: Icba0e391164f2c1a9fefeab4b0bcb878e91d17b4
nstall.cpp
erifier.cpp
erifier.h
erifier_test.cpp
bf80f49edcec6b22ad7b1219e6ed6eda1e930c8c 19-Oct-2012 Doug Zongker <dougz@android.com> reduce some recovery logging

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
pplypatch/applypatch.c
inzip/Zip.c
a0d9ddb8f2922088b08219326afeaf532b3af5ac 17-Oct-2012 Kenny Root <kroot@google.com> am cd74108c: resolved conflicts for merge of 78afed1c to jb-mr1-dev-plus-aosp

* commit 'cd74108cdac228e946ca8b6ea2ff11ab62941a6d':
Remove HAVE_SELINUX guards
cd74108cdac228e946ca8b6ea2ff11ab62941a6d 17-Oct-2012 Kenny Root <kroot@google.com> resolved conflicts for merge of 78afed1c to jb-mr1-dev-plus-aosp

Change-Id: I861e3a6aa07c448909b2ae54618bba178bd6e457
78afed1c15989d4aa7e66094afa81cd3a6d22674 17-Oct-2012 Kenny Root <kroot@google.com> Merge "Remove HAVE_SELINUX guards"
7eb7567aa3faebfb22bd052f3505d485ee23d585 16-Oct-2012 Kenny Root <kroot@google.com> Remove HAVE_SELINUX guards

Change-Id: Ia96201f20f7838d7d9e8926208977d3f8318ced4
ndroid.mk
inzip/Android.mk
inzip/DirUtil.c
inzip/DirUtil.h
inzip/Zip.c
inzip/Zip.h
ecovery.cpp
pdater/Android.mk
pdater/install.c
pdater/updater.c
pdater/updater.h
2b44a5632613fc99671dae50c5e32f3dbc2aeaa7 10-Oct-2012 The Android Open Source Project <initial-contribution@android.com> am d0d4d44d: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'd0d4d44d344779e59ee196637bbc745d68d70677':
d0d4d44d344779e59ee196637bbc745d68d70677 10-Oct-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I3afa60bf8978d750c7072128e9f5e87c5d624b36
5afeff505e28707c6672ccb7897397d8e3821796 10-Oct-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-factory-release history after reset to jb-mr1-dev
a88a3b35960e5c12fd4de18c58376d9c78e19043 10-Oct-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
44df5c8692d37e2d5e729b52b908e1a49df83a84 10-Oct-2012 Devin Kim <dojip.kim@lge.com> am 4b57f8f2: am 6016d08b: recovery: fix failure to unmount "/cache"

* commit '4b57f8f2affade295ec856e2bc63ba02e9f079c4':
recovery: fix failure to unmount "/cache"
4b57f8f2affade295ec856e2bc63ba02e9f079c4 10-Oct-2012 Devin Kim <dojip.kim@lge.com> am 6016d08b: recovery: fix failure to unmount "/cache"

* commit '6016d08b0c3b682f1f7000b42a9ea4b6b6d74f22':
recovery: fix failure to unmount "/cache"
3abfe0911e1b5b542dd8c02b186e6a7df9926476 09-Oct-2012 The Android Open Source Project <initial-contribution@android.com> am 2c3d1d83: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '2c3d1d83d5f28160baa5cbec782d518fa186af73':
2c3d1d83d5f28160baa5cbec782d518fa186af73 09-Oct-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr1-release - do not merge

Change-Id: I692d63796f64702243898ae1d20d8ce073dc15e6
0ed4bd5e22055d86268f4092c23a30b01a3ece0f 09-Oct-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
6016d08b0c3b682f1f7000b42a9ea4b6b6d74f22 08-Oct-2012 Devin Kim <dojip.kim@lge.com> 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>
ecovery.cpp
2e883a8deb6a6ade1d0c5439f186673a46918471 08-Oct-2012 Doug Zongker <dougz@google.com> am 80fb6818: am 8347cb2d: revert to tacky 3D recovery animation

* commit '80fb68181e2a396de97c3d1b2d7c9e736cec4417':
revert to tacky 3D recovery animation
80fb68181e2a396de97c3d1b2d7c9e736cec4417 08-Oct-2012 Doug Zongker <dougz@google.com> am 8347cb2d: revert to tacky 3D recovery animation

* commit '8347cb2d813b9a8b7c9165aadaea0b699eb5082f':
revert to tacky 3D recovery animation
8347cb2d813b9a8b7c9165aadaea0b699eb5082f 08-Oct-2012 Doug Zongker <dougz@google.com> revert to tacky 3D recovery animation

Bug: 7204420
Change-Id: I16d3346ce54b1aa5a0e6a02839ae9fbd4718fffa
es/images/icon_error.png
es/images/icon_installing.png
es/images/icon_installing_overlay01.png
es/images/icon_installing_overlay02.png
es/images/icon_installing_overlay03.png
es/images/icon_installing_overlay04.png
es/images/icon_installing_overlay05.png
es/images/icon_installing_overlay06.png
es/images/icon_installing_overlay07.png
es/images/icon_installing_overlay08.png
es/images/icon_installing_overlay09.png
es/images/icon_installing_overlay10.png
es/images/icon_installing_overlay11.png
es/images/icon_installing_overlay12.png
es/images/icon_installing_overlay13.png
es/images/icon_installing_overlay14.png
es/images/icon_installing_overlay15.png
es/images/icon_installing_overlay16.png
es/images/icon_installing_overlay17.png
es/images/icon_installing_overlay18.png
es/images/icon_installing_overlay19.png
es/images/icon_installing_overlay20.png
es/images/icon_installing_overlay21.png
es/images/icon_installing_overlay22.png
es/images/icon_installing_overlay23.png
es/images/icon_installing_overlay24.png
es/images/icon_installing_overlay25.png
es/images/icon_installing_overlay26.png
es/images/icon_installing_overlay27.png
es/images/icon_installing_overlay28.png
es/images/icon_installing_overlay29.png
es/images/icon_installing_overlay30.png
es/images/icon_installing_overlay31.png
es/images/icon_installing_overlay32.png
es/images/icon_installing_overlay33.png
es/images/icon_installing_overlay34.png
es/images/icon_installing_overlay35.png
es/images/icon_installing_overlay36.png
es/images/icon_installing_overlay37.png
es/images/icon_installing_overlay38.png
es/images/icon_installing_overlay39.png
es/images/icon_installing_overlay40.png
es/images/icon_installing_overlay41.png
es/images/icon_installing_overlay42.png
es/images/icon_installing_overlay43.png
es/images/icon_installing_overlay44.png
es/images/icon_installing_overlay45.png
es/images/icon_installing_overlay46.png
es/images/icon_installing_overlay47.png
es/images/icon_installing_overlay48.png
es/images/indeterminate01.png
es/images/indeterminate02.png
es/images/indeterminate03.png
es/images/indeterminate04.png
es/images/indeterminate05.png
es/images/indeterminate06.png
es/images/indeterminate07.png
es/images/indeterminate08.png
es/images/indeterminate09.png
es/images/indeterminate10.png
es/images/indeterminate11.png
es/images/indeterminate12.png
es/images/indeterminate13.png
es/images/indeterminate14.png
es/images/indeterminate15.png
es/images/indeterminate16.png
creen_ui.cpp
92b466f883e3794f1b3b582905fcdfa7d86c120f 26-Sep-2012 The Android Open Source Project <initial-contribution@android.com> am 6cc3ded2: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '6cc3ded278818e2897459bdfdc5a5fb4b9ef3071':
6cc3ded278818e2897459bdfdc5a5fb4b9ef3071 26-Sep-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr1-release - do not merge

Change-Id: I887d27a16a0713ca92f3b2ebc570033cdb8759fb
6c73027700b9f09e68f4e6fa3b583f3a7837606d 25-Sep-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
4e0c8cc8dfca9f4e2738607f93c5c2d96ffc3674 24-Sep-2012 Doug Zongker <dougz@google.com> am a8db3764: am 6c8553dd: display error state on OTA failure

* commit 'a8db3764010310045f63bf8da860a9529b948133':
display error state on OTA failure
a8db3764010310045f63bf8da860a9529b948133 24-Sep-2012 Doug Zongker <dougz@google.com> am 6c8553dd: display error state on OTA failure

* commit '6c8553dda8b7fb45adc9f48a294c130b7e283f40':
display error state on OTA failure
6c8553dda8b7fb45adc9f48a294c130b7e283f40 24-Sep-2012 Doug Zongker <dougz@google.com> 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
ecovery.cpp
62831de1beb34fa5a4526d2144610a8a587cdc33 20-Sep-2012 The Android Open Source Project <initial-contribution@android.com> am 15eaee40: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '15eaee40a19c0d7391b5f209e4336e889be43297':
tweak recovery text images
localization for recovery messages
15eaee40a19c0d7391b5f209e4336e889be43297 20-Sep-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr1-release - do not merge

Change-Id: Ifa58ce936a9bf0a9e95f46eebcb4f64c772aa5ba
f8084b400db56192f9a6b115d5b4e03ca6b23023 19-Sep-2012 Doug Zongker <dougz@google.com> am 42afb545: am b66cb69e: tweak recovery text images

* commit '42afb5457f75cffb29a6d658fbf17961210080fd':
tweak recovery text images
42afb5457f75cffb29a6d658fbf17961210080fd 19-Sep-2012 Doug Zongker <dougz@google.com> am b66cb69e: tweak recovery text images

* commit 'b66cb69e3933d5f56f06d88cd31817f49d87df5f':
tweak recovery text images
cda00bba51c6adbf95e451fd8c6cad7a5390503a 18-Sep-2012 Doug Zongker <dougz@google.com> 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
es/images/erasing_text.png
es/images/error_text.png
es/images/installing_text.png
es/images/no_command_text.png
creen_ui.cpp
ea6b2a7a85e1302b23ed0d9916e4b38015bc9a23 18-Sep-2012 Doug Zongker <dougz@google.com> 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
ecovery.cpp
es/images/erasing_text.png
es/images/error_text.png
es/images/installing_text.png
es/images/no_command_text.png
creen_ui.cpp
creen_ui.h
i.h
b66cb69e3933d5f56f06d88cd31817f49d87df5f 18-Sep-2012 Doug Zongker <dougz@google.com> 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
es/images/erasing_text.png
es/images/error_text.png
es/images/installing_text.png
es/images/no_command_text.png
creen_ui.cpp
c099f2d938532a4097b373b361cfb5615199257e 18-Sep-2012 Doug Zongker <dougz@google.com> am ed3bc11e: am 5fa8c239: localization for recovery messages

* commit 'ed3bc11e7dd4b6e0ddb77a3c9492675d8ac6855d':
localization for recovery messages
ed3bc11e7dd4b6e0ddb77a3c9492675d8ac6855d 18-Sep-2012 Doug Zongker <dougz@google.com> am 5fa8c239: localization for recovery messages

* commit '5fa8c23911759a9e81af0e7fb5eb431277b8e9a6':
localization for recovery messages
5fa8c23911759a9e81af0e7fb5eb431277b8e9a6 18-Sep-2012 Doug Zongker <dougz@google.com> 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
ecovery.cpp
es/images/erasing_text.png
es/images/error_text.png
es/images/installing_text.png
es/images/no_command_text.png
creen_ui.cpp
creen_ui.h
i.h
7ae6e202010ab657e778e656df656bf1e5cb04e2 06-Sep-2012 The Android Open Source Project <initial-contribution@android.com> am 74a806e5: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '74a806e5efbfd4a37725f2f1e193c3c2eb973fb7':
fix format of installing_text
74a806e5efbfd4a37725f2f1e193c3c2eb973fb7 06-Sep-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr1-release - do not merge

Change-Id: Ia9cde557f8e6abaf0935e6b238eb956be09c12ca
f8be7694889cbdb08ef7edd605d11607bb3638a0 05-Sep-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
4ce95408144b873b469b1049c91fdcd8fd48e3ef 05-Sep-2012 Doug Zongker <dougz@google.com> am 52eeea4f: minor recovery fixes

* commit '52eeea4fa59c15ecb09c32b8e05653f4e55f5188':
minor recovery fixes
52eeea4fa59c15ecb09c32b8e05653f4e55f5188 04-Sep-2012 Doug Zongker <dougz@google.com> 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
inui/graphics.c
inui/resources.c
creen_ui.cpp
276657839e3ae2e3f263a6e46ce6c0c0dfa3dbaf 30-Aug-2012 Doug Zongker <dougz@google.com> fix format of installing_text

Was submitted in the wrong PNG format (color type 4 instead of 0).

Change-Id: I8780c81eb92bdfc407b43948a92b37d93026325a
es/images/installing_text.png
ae0655b4077f95ff72fb038baaf7a95680853aa7 30-Aug-2012 Doug Zongker <dougz@google.com> am f4c6ec84: fix format of installing_text

* commit 'f4c6ec84c24611856374353bdef87baca5694cc0':
fix format of installing_text
f4c6ec84c24611856374353bdef87baca5694cc0 30-Aug-2012 Doug Zongker <dougz@google.com> fix format of installing_text

Was submitted in the wrong PNG format (color type 4 instead of 0).

Change-Id: I8780c81eb92bdfc407b43948a92b37d93026325a
es/images/installing_text.png
a0ba2d3a6299a3931821b5c6ae10964e6815e8ea 30-Aug-2012 Doug Zongker <dougz@google.com> am aff4dbb0: Merge "recovery locale handling fixes" into jb-mr1-dev

* commit 'aff4dbb0ae33e55785d1a11f93c1e20ebfed4a90':
recovery locale handling fixes
aff4dbb0ae33e55785d1a11f93c1e20ebfed4a90 30-Aug-2012 Doug Zongker <dougz@google.com> Merge "recovery locale handling fixes" into jb-mr1-dev
8b240ccca1ad32cbd09d3807614f3086914ceaaf 30-Aug-2012 Doug Zongker <dougz@google.com> 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
inui/resources.c
ecovery.cpp
es/images/erasing_text.png
es/images/error_text.png
es/images/installing_text.png
es/images/no_command_text.png
b5f4261a220122485dfe4ed452149a964ddb515c 24-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am d52ef348: am bddbb5b3: Merge "Fixing trivial warnings for libminui"

* commit 'd52ef348d5abb65cd067be334d37c86d621786b9':
Fixing trivial warnings for libminui
d52ef348d5abb65cd067be334d37c86d621786b9 24-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am bddbb5b3: Merge "Fixing trivial warnings for libminui"

* commit 'bddbb5b370d925d6e5ae62d560f5e7ad09a6ffac':
Fixing trivial warnings for libminui
bddbb5b370d925d6e5ae62d560f5e7ad09a6ffac 24-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Fixing trivial warnings for libminui"
51aa144d2626d2200401e94129df999821e35a63 24-Aug-2012 Stephen Hines <srhines@google.com> am 3474ab28: Merge "Add libm due to libpng dependency." into jb-mr1-dev

* commit '3474ab2888838e512c6bcff588fa88f02c81135f':
Add libm due to libpng dependency.
3474ab2888838e512c6bcff588fa88f02c81135f 24-Aug-2012 Stephen Hines <srhines@google.com> Merge "Add libm due to libpng dependency." into jb-mr1-dev
9383c8cb0bb9625590a48418b212d4a79e451e7d 24-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am e630d945: am 6a693d57: Merge "Fixed warnings in libmtdutils"

* commit 'e630d945f90a3a5610529b761ea9638929949a2e':
Fixed warnings in libmtdutils
d863682672107511fa81cd7df3046bf8465f0552 24-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 8876725f: am 0254d573: Merge "Fix multiple defined symbol errors"

* commit '8876725f05518e8170aedb81ab40dfe638eb656f':
Fix multiple defined symbol errors
b07faf8f1a7d4bde3fd8b4f7926ad11b38599970 24-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 7b827d04: am 481e03e3: Merge "Fixed unused param warnings for check-lost+found"

* commit '7b827d04a5cab7d8c5573181de3eb4ea2d0e173a':
Fixed unused param warnings for check-lost+found
e630d945f90a3a5610529b761ea9638929949a2e 24-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 6a693d57: Merge "Fixed warnings in libmtdutils"

* commit '6a693d57687a18f8e032293b71ca98882a78c93d':
Fixed warnings in libmtdutils
8876725f05518e8170aedb81ab40dfe638eb656f 24-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 0254d573: Merge "Fix multiple defined symbol errors"

* commit '0254d57367432069256b623c6852da8b92626e79':
Fix multiple defined symbol errors
7b827d04a5cab7d8c5573181de3eb4ea2d0e173a 24-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 481e03e3: Merge "Fixed unused param warnings for check-lost+found"

* commit '481e03e39810ba1b7eab1d0d806039f45c4ad987':
Fixed unused param warnings for check-lost+found
91eb7219696a9bff72c3464c37798e70f7e605ee 24-Aug-2012 Stephen Hines <srhines@google.com> Add libm due to libpng dependency.

Change-Id: I0bdc2df5ef358813587f613a1b50eaa850e95782
ndroid.mk
cf9f4e0020dadc71d50110764d407377ce09ea2d 23-Aug-2012 Doug Zongker <dougz@google.com> am 4f33e55d: change recovery images to android with spinner

* commit '4f33e55d1c38d2f72f3306a82c177850f3676408':
change recovery images to android with spinner
4f33e55d1c38d2f72f3306a82c177850f3676408 23-Aug-2012 Doug Zongker <dougz@google.com> change recovery images to android with spinner

Also make writing the locale a bit more robust.

Change-Id: I803dd0aa0b9d6661fad74ea13fb085682402323c
ecovery.cpp
es/images/icon_error.png
es/images/icon_installing.png
es/images/icon_installing_overlay01.png
es/images/icon_installing_overlay02.png
es/images/icon_installing_overlay03.png
es/images/icon_installing_overlay04.png
es/images/icon_installing_overlay05.png
es/images/icon_installing_overlay06.png
es/images/icon_installing_overlay07.png
es/images/icon_installing_overlay08.png
es/images/icon_installing_overlay09.png
es/images/icon_installing_overlay10.png
es/images/icon_installing_overlay11.png
es/images/icon_installing_overlay12.png
es/images/icon_installing_overlay13.png
es/images/icon_installing_overlay14.png
es/images/icon_installing_overlay15.png
es/images/icon_installing_overlay16.png
es/images/icon_installing_overlay17.png
es/images/icon_installing_overlay18.png
es/images/icon_installing_overlay19.png
es/images/icon_installing_overlay20.png
es/images/icon_installing_overlay21.png
es/images/icon_installing_overlay22.png
es/images/icon_installing_overlay23.png
es/images/icon_installing_overlay24.png
es/images/icon_installing_overlay25.png
es/images/icon_installing_overlay26.png
es/images/icon_installing_overlay27.png
es/images/icon_installing_overlay28.png
es/images/icon_installing_overlay29.png
es/images/icon_installing_overlay30.png
es/images/icon_installing_overlay31.png
es/images/icon_installing_overlay32.png
es/images/icon_installing_overlay33.png
es/images/icon_installing_overlay34.png
es/images/icon_installing_overlay35.png
es/images/icon_installing_overlay36.png
es/images/icon_installing_overlay37.png
es/images/icon_installing_overlay38.png
es/images/icon_installing_overlay39.png
es/images/icon_installing_overlay40.png
es/images/icon_installing_overlay41.png
es/images/icon_installing_overlay42.png
es/images/icon_installing_overlay43.png
es/images/icon_installing_overlay44.png
es/images/icon_installing_overlay45.png
es/images/icon_installing_overlay46.png
es/images/icon_installing_overlay47.png
es/images/icon_installing_overlay48.png
es/images/indeterminate01.png
es/images/indeterminate02.png
es/images/indeterminate03.png
es/images/indeterminate04.png
es/images/indeterminate05.png
es/images/indeterminate06.png
es/images/indeterminate07.png
es/images/indeterminate08.png
es/images/indeterminate09.png
es/images/indeterminate10.png
es/images/indeterminate11.png
es/images/indeterminate12.png
es/images/indeterminate13.png
es/images/indeterminate14.png
es/images/indeterminate15.png
es/images/indeterminate16.png
creen_ui.cpp
ec5eceb849b7038b271dc5882cbbc8f72265e026 23-Aug-2012 Doug Zongker <dougz@google.com> am 02ec6b88: add simple text to recovery UI

* commit '02ec6b88ed4e6cf40cc257572b07c7277b7b6341':
add simple text to recovery UI
6a693d57687a18f8e032293b71ca98882a78c93d 23-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Fixed warnings in libmtdutils"
0254d57367432069256b623c6852da8b92626e79 23-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Fix multiple defined symbol errors"
481e03e39810ba1b7eab1d0d806039f45c4ad987 23-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Fixed unused param warnings for check-lost+found"
02ec6b88ed4e6cf40cc257572b07c7277b7b6341 23-Aug-2012 Doug Zongker <dougz@google.com> 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
nstall.cpp
nstall.h
inui/graphics.c
inui/minui.h
inui/resources.c
ecovery.cpp
es/images/erasing_text.png
es/images/error_text.png
es/images/installing_text.png
es/images/no_command_text.png
creen_ui.cpp
creen_ui.h
i.h
edc5d17096bd1a69fee0f3470a2af4fe46969bec 27-Jul-2012 Edwin Vane <edwin.vane@intel.com> 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>
inui/resources.c
0298ec21d2f895f03fcce2377f64ab4cb88bca8a 22-May-2012 Edwin Vane <edwin.vane@intel.com> 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>
inzip/inline_magic.h
4f66d550e913a7b9f7a3c8cf8663bba46dd2ca02 27-Jul-2012 Edwin Vane <edwin.vane@intel.com> 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>
ools/ota/check-lost+found.c
76b6666f2491ea3be24a19cea59f894db6f8e22f 27-Jul-2012 Edwin Vane <edwin.vane@intel.com> 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>
tdutils/mtdutils.c
13a29ea9688fd6169d69f506d5028a49038c5434 21-Aug-2012 Doug Zongker <dougz@google.com> am a3ccba6d: add bonus data feature to imgdiff/imgpatch/applypatch

* commit 'a3ccba6d314cb29b02d1dbda9a71427b11da936d':
add bonus data feature to imgdiff/imgpatch/applypatch
a3ccba6d314cb29b02d1dbda9a71427b11da936d 21-Aug-2012 Doug Zongker <dougz@google.com> 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
pplypatch/applypatch.c
pplypatch/applypatch.h
pplypatch/imgdiff.c
pplypatch/imgpatch.c
pplypatch/main.c
pdater/install.c
b8ae4f8e20badc475a569dd0311636bdd0619862 17-Aug-2012 Joe Onorato <joeo@google.com> am 55850258: am 3733d218: Merge changes I664f8dc7,I4154db06,I5e1df90f

* 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
5585025814418e8b692a3a38b7cff495180a74f8 17-Aug-2012 Joe Onorato <joeo@google.com> am 3733d218: Merge changes I664f8dc7,I4154db06,I5e1df90f

* 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
3733d2185bbcedd9ef626907f1f32628986cc0f5 17-Aug-2012 Joe Onorato <joeo@google.com> Merge changes I664f8dc7,I4154db06,I5e1df90f

* changes:
Use the static version of libsparse
Multiple modules with the same name are going away.
host modules don't need LOCAL_MODULE_TAGS
e709c24f27afc11714b00bf2487dcadbbf2cff9c 24-Jul-2012 Joe Onorato <joeo@google.com> Use the static version of libsparse

Change-Id: I664f8dc7939f8f902e4775eaaf6476fcd4ab8ed2
ndroid.mk
pdater/Android.mk
f47ae6a4d9a2f945eb3b74c001c5917446d707f8 01-Jun-2012 Joe Onorato <joeo@google.com> Multiple modules with the same name are going away.

Change-Id: I4154db066865d6031caa3c2c3b94064b2f28076e
ndroid.mk
pdater/Android.mk
fc417fc4c4edcf49fc1e6d2cc95c2c7f381629cd 19-May-2012 Joe Onorato <joeo@google.com> host modules don't need LOCAL_MODULE_TAGS

Change-Id: I5e1df90f18fbaf98e3207c553a8fb859c1064137
pplypatch/Android.mk
f510f069fd35eb259799f594975c1a990e41d870 08-Aug-2012 Colin Cross <ccross@android.com> recovery: import init.recovery.${ro.hardware}.rc

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
tc/init.rc
a23075fb0e23978e5b8f3a7c92280ee1b2274e6d 07-Aug-2012 Doug Zongker <dougz@google.com> fix the symlink() command to create directories if needed

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
pdater/install.c
64c5a59be97ce8c6d05fb16a9c9f49ba520a35b3 26-Jul-2012 Ed Heyl <ed@google.com> fix conflicts with merge of jb-dev-mako

Change-Id: I2d8d18232ed02b2c4e3e661544046bf4b8039800
17495277b1a6328f5cae68523ad00be1f1107950 25-Jul-2012 Doug Zongker <dougz@android.com> support version 2 (2048-bit e=65537) keys in recovery

Change-Id: I9849c69777d513bb12926c8c622d1c12d2da568a
nstall.cpp
estdata/otasigned_f4.zip
estdata/test_f4.pk8
estdata/test_f4.x509.pem
erifier_test.cpp
erifier_test.sh
4eeb379886f9ee3d832a38805ceaf15e0e08d685 24-Jul-2012 Joe Onorato <joeo@google.com> Use the static version of libsparse

Change-Id: I664f8dc7939f8f902e4775eaaf6476fcd4ab8ed2
ndroid.mk
pdater/Android.mk
6396e70d3fd381f6e3ccaff84c5a05bc5e3cec3c 01-Jun-2012 Joe Onorato <joeo@google.com> Multiple modules with the same name are going away.

Change-Id: I4154db066865d6031caa3c2c3b94064b2f28076e
ndroid.mk
pdater/Android.mk
c0481af40604b8a83ff2ddfbc04b37045c7fa228 19-May-2012 Joe Onorato <joeo@google.com> host modules don't need LOCAL_MODULE_TAGS

Change-Id: I5e1df90f18fbaf98e3207c553a8fb859c1064137
pplypatch/Android.mk
aade2e590e17b0f47dbf554f7df5824ba4096212 21-Jul-2012 Doug Zongker <dougz@android.com> am dd6cd4fc: Merge "graphics: add support for "single buffering""

* commit 'dd6cd4fcc1b22df7f55e1ab3e54589939dc54179':
graphics: add support for "single buffering"
dd6cd4fcc1b22df7f55e1ab3e54589939dc54179 21-Jul-2012 Doug Zongker <dougz@android.com> Merge "graphics: add support for "single buffering""
862d026fb2aebb3e30be68ce2f48ef226e8c3a20 19-Jul-2012 Devin Kim <dojip.kim@lge.com> minui: fix screen update issue

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>
inui/graphics.c
ee57854b7e2836240a14b955f8b6622b4dca61b6 18-Jul-2012 Colin Cross <ccross@android.com> am 989a2859: Merge "Link against libsparse"

* commit '989a28599a600b649f71a06335bf1e4085b5505a':
Link against libsparse
989a28599a600b649f71a06335bf1e4085b5505a 18-Jul-2012 Colin Cross <ccross@android.com> Merge "Link against libsparse"
cde94f309c85d673648126c1de12952ed690b561 25-Apr-2012 Colin Cross <ccross@android.com> Link against libsparse

libext4_utils requires libsparse, link against it as well.

Change-Id: I4d6aec0e5edcf1ed42118b7b77adcded2858d3dd
ndroid.mk
pdater/Android.mk
0e34880ca2147073b6daf3fd4b251f0be3fca635 01-Jul-2011 Octavian Purdila <octavian.purdila@intel.com> 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>
inui/graphics.c
9c5efe6bdecfaa37fdc7c552253d2bd53235b117 11-Jul-2012 Doug Zongker <dougz@android.com> allow double-quotes or not in TARGET_RECOVERY_PIXEL_FORMAT

Change-Id: I0bf22c87c51a34ee4a839c4966277fad8150bd59
inui/Android.mk
956cde8578c40ec812a933a14cb4e82f2c0de320 27-Jun-2012 Nick Kralevich <nnk@google.com> Add mode when open(O_CREAT) is used.

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
pplypatch/applypatch.c
ea17e320b0bc4437e8a881026f296b71fa02ad3e 12-Jun-2012 Ying Wang <wangying@google.com> am 6d60667d: Merge "Use a dependency file to replace the list file."

* commit '6d60667de6b8e6bd8a54fb4031901e2935743308':
Use a dependency file to replace the list file.
6d60667de6b8e6bd8a54fb4031901e2935743308 12-Jun-2012 Ying Wang <wangying@google.com> Merge "Use a dependency file to replace the list file."
eef790de669c378f91dcd7bce98ab0af5f727198 11-Jun-2012 Ying Wang <wangying@google.com> Use a dependency file to replace the list file.

instead of creating the list file whenever loading the Android.mk

Change-Id: I78e4820754399dff3993a863eede8b75da9f6d29
pdater/Android.mk
5f4eeec23c875156973d8155a2c13ca4dbc89abc 16-May-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I66ce5e9ca22d4aecb694bf8814fbf3404fb0013b
0c0efa0285301d1d50f5151b1c3fc74952f9dda1 30-Apr-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to jb-dev
69f4b6732ce13f248b0da0c7eeda56207fdeaba2 26-Apr-2012 Doug Zongker <dougz@android.com> fix timed progress bars in recovery

They're completely broken and have been for months because this code
makes no sense.

Change-Id: Ibabcd3dbe5a004a45b341e4a5215aa3df77e1861
creen_ui.cpp
42b7340563f631a1f96f6b38a901dc0d0713ef66 16-Apr-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to master
f69d40afa190a2b6938979fe10760c74a8cc55b3 12-Apr-2012 Doug Zongker <dougz@android.com> am e5d5ac76: minor recovery changes

* commit 'e5d5ac76cc8e5d11867aeff6a1d068215c1c3a7c':
minor recovery changes
e5d5ac76cc8e5d11867aeff6a1d068215c1c3a7c 12-Apr-2012 Doug Zongker <dougz@android.com> 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
dify/expr.c
dify/expr.h
nstall.cpp
ecovery.cpp
25bb2a3d74d6efed1870ba6907858f1bcfc7cd0a 10-Apr-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to master
c686a397158197d9ceb28ee482af0609e6f4215f 09-Apr-2012 Doug Zongker <dougz@android.com> Merge "Add NOTICE file"
8619a7821462b912d931b3f52ed5cca9c3f303b6 09-Apr-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to master
038818cb6393f2829bd86f99f25051f67c131290 08-Apr-2012 Kenny Root <kroot@google.com> Update merge for SELinux to compile

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
ecovery.cpp
1e4469a7866e4ec3459734b36eef3fb67035b4d4 07-Apr-2012 Kenny Root <kroot@android.com> am 78911bdf: am 2a4ab824: Merge "Change the format command to always take the mount point as an argument."

* commit '78911bdf4f9dfff6583f3f8150a3257212ceea13':
Change the format command to always take the mount point as an argument.
78911bdf4f9dfff6583f3f8150a3257212ceea13 07-Apr-2012 Kenny Root <kroot@android.com> am 2a4ab824: Merge "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.
2a4ab824b39e429969199c189ae1b6c1115e51d5 06-Apr-2012 Kenny Root <kroot@android.com> Merge "Change the format command to always take the mount point as an argument."
6e960cd22151077130749046b44ed1fbeea2d0f0 06-Apr-2012 Wei Zhong <wzhong@google.com> Add NOTICE file

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)
pplypatch/NOTICE
345544c924c52f5c4d763dede94d45c9cf4dd3e4 03-Apr-2012 Mike Lockwood <lockwood@google.com> Merge remote-tracking branch 'goog/ics-aah'
516e4e23721e4e5aa0a349ab8f27c22a81665880 03-Apr-2012 Stephen Smalley <sds@tycho.nsa.gov> Change the format command to always take the mount point as an argument.

Requires I5a63fd61a7e74d386d0803946d06bcf2fa8a857e

Change-Id: Ica5fb73d6f2ffb981b74d1896538988dbc4d9b24
pdater/install.c
bc05cb893adf18f588a5188286cbe0c86774aee0 02-Apr-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to master
41dda82d847ae8c261b09c383806b412d680f935 31-Mar-2012 Kenny Root <kroot@google.com> resolved conflicts for merge of 0b1fee1b to master

Change-Id: I2e8298ff5988a96754f56f80a5186c9605ad9928
0b1fee1b2aa7da86ffdabfe4c577ee8adb93d803 31-Mar-2012 Kenny Root <kroot@android.com> am 155cd3c1: Merge changes Ied379f26,I09fb9d56

* commit '155cd3c155004433215147437cdf71844c9efd87':
Extend recovery and updater to support setting file security contexts.
Add libselinux to LOCAL_STATIC_LIBRARIES wherever libext4_utils is used.
155cd3c155004433215147437cdf71844c9efd87 31-Mar-2012 Kenny Root <kroot@android.com> Merge changes Ied379f26,I09fb9d56

* changes:
Extend recovery and updater to support setting file security contexts.
Add libselinux to LOCAL_STATIC_LIBRARIES wherever libext4_utils is used.
779701db515d1a0d363d5a8896252f331bc4e22a 09-Feb-2012 Stephen Smalley <sds@tycho.nsa.gov> Extend recovery and updater to support setting file security contexts.

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
ndroid.mk
inzip/Android.mk
inzip/DirUtil.c
inzip/DirUtil.h
inzip/Zip.c
inzip/Zip.h
ecovery.c
oots.c
pdater/Android.mk
pdater/install.c
pdater/updater.c
pdater/updater.h
9d3b75603bb7120c69d2b5a4f4e3da3d4d6e709e 26-Mar-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to master
b2364342a05a689bc302bfcd7d5d15f528eb772c 22-Mar-2012 Doug Zongker <dougz@android.com> Merge "fail edify script if set_perm() or symlink() fails"
acd73ed156e6f10b96fc277738845f833c514b77 22-Mar-2012 Doug Zongker <dougz@android.com> fail edify script if set_perm() or symlink() fails

It's surprising if these fail, so abort the whole edify script to
catch any problems early.

Bug: 2284848
Change-Id: Ia2a0b60e7f086fc590b242616028905a229c9e05
pdater/install.c
19021a77ecfa464f1a62c57699f317c154f50190 21-Mar-2012 Mike Lockwood <lockwood@google.com> Merge remote-tracking branch 'goog/ics-aah-exp'
cc8d28efa4b1b35a463fdcf277751f709338752e 21-Mar-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to master
ba5e5474f3c59c91d479e678e88611d0ffb9e8eb 20-Mar-2012 The Android Automerger <android-build@android.com> merge in jb-release history after reset to master
48704798ea79a4cf0a4024ffcd18fc11ca03a43c 19-Mar-2012 Doug Zongker <dougz@android.com> run minadbd as shell user, remove unused code

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.
tc/init.rc
inadbd/README.txt
inadbd/adb.c
inadbd/adb.h
inadbd/services.c
inadbd/sockets.c
inadbd/sysdeps.h
inadbd/transport.c
inadbd/transport_usb.c
098d1f63c64cdc0975ce8cd650e82e4043fc2600 20-Mar-2012 Doug Zongker <dougz@android.com> remove unused code from minadbd

Change-Id: I2f192c67ef425a53a1dba65d3e0544c1d5a567bd
inadbd/README.txt
inadbd/adb.c
inadbd/adb.h
inadbd/sockets.c
inadbd/transport.c
inadbd/transport_usb.c
703ed152147d90a549a2fee7cda5771703e502a0 19-Mar-2012 Doug Zongker <dougz@android.com> run minadbd as shell user

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
tc/init.rc
inadbd/README.txt
inadbd/adb.c
inadbd/services.c
inadbd/sysdeps.h
35a35a67663127e42c8048ca0dc7465068a5606f 28-Feb-2012 Doug Zongker <dougz@android.com> remove retouching code from updater

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
inelf/Retouch.c
inelf/Retouch.h
pdater/install.c
b07b293944c2002a39bbd804f0b6f590ed8458cd 28-Feb-2012 Doug Zongker <dougz@android.com> fix build

Change-Id: I44a75f5451af053778be299b23274ecce9b2db76
pplypatch/applypatch.c
pplypatch/applypatch.h
inelf/Retouch.c
1c43c9741bc4d9f62f2e3262cea1309890d1bbd2 28-Feb-2012 Doug Zongker <dougz@android.com> fix failure to free memory

The applypatch function is somewhat sloppy about freeing memory (since
it was originally a standalone binary). Fix some of that.

Change-Id: Ifd44d71ea189c0b5115493119fd57bc37533fd59
pplypatch/applypatch.c
pplypatch/applypatch.h
53013c464552911a17585d1915a87011d2c2abc5 01-Feb-2012 The Android Open Source Project <initial-contribution@android.com> am 62947db5: am 37d0f260: Reconcile with ics-mr1-release

* commit '62947db579fa7acc9ee01d71f3aeb30add3df260':
62947db579fa7acc9ee01d71f3aeb30add3df260 01-Feb-2012 The Android Open Source Project <initial-contribution@android.com> am 37d0f260: Reconcile with ics-mr1-release

* commit '37d0f260a55cfbe2b275131b12b2b5b824955e51':
37d0f260a55cfbe2b275131b12b2b5b824955e51 01-Feb-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with ics-mr1-release

Change-Id: Id3629feac35e35922942a6d04e741e72b95fded4
74a6279eb43d10527b15149311058d6b7af0fac8 31-Jan-2012 Elliott Hughes <enh@google.com> libz is a superset of libunz, so we don't need both.

Change-Id: I082995c338feaf5d11288300768624cd51b027a4
ndroid.mk
1a114494950d8bce01bb860cd8a7221fdc9593cc 13-Jan-2012 Stephen Smalley <sds@tycho.nsa.gov> Add libselinux to LOCAL_STATIC_LIBRARIES wherever libext4_utils is used.

libext4_utils now calls libselinux in order to determine the
file security context to set on files when creating ext4 images.

Change-Id: I09fb9d563d22ee106bf100eacd4cd9c6300b1152
ndroid.mk
pdater/Android.mk
48b5b0737c127a049bf16f9c69926c4da8668112 18-Jan-2012 Doug Zongker <dougz@android.com> allow recovery UI to ignore certain keypresses

Change-Id: Id182bb95ffcc475c5acabb29b413e422302ae7f2
i.cpp
i.h
45fdb3899dfc1986290667f4a33f3088f0d80aab 18-Jan-2012 Doug Zongker <dougz@android.com> Merge "allow recovery UI to ignore certain keypresses" into ics-aah
336a9949c47eaead7cbedec118dd15e84e26f523 18-Jan-2012 Doug Zongker <dougz@android.com> allow recovery UI to ignore certain keypresses

Change-Id: Id182bb95ffcc475c5acabb29b413e422302ae7f2
i.cpp
i.h
e83b7cf8f1bad5b334b6352d3b850d8555530a9a 10-Jan-2012 Doug Zongker <dougz@android.com> support "sideload over ADB" mode

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.
ndroid.mk
db_install.cpp
db_install.h
efault_device.cpp
evice.h
tc/init.rc
inadbd/Android.mk
inadbd/README.txt
inadbd/adb.c
inadbd/adb.h
inadbd/fdevent.c
inadbd/fdevent.h
inadbd/mutex_list.h
inadbd/services.c
inadbd/sockets.c
inadbd/sysdeps.h
inadbd/transport.c
inadbd/transport.h
inadbd/transport_usb.c
inadbd/usb_linux_client.c
inadbd/utils.c
inadbd/utils.h
ecovery.cpp
6639248d02ce544538eea83488c1ed4a3b46a7fc 10-Jan-2012 Doug Zongker <dougz@android.com> 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.

Change-Id: If4c915403e6f43bfe922aa347e350a8982443106
tc/init.rc
3e8ba436854ecbd15f494ff7ebb9927fa47cb11b 10-Jan-2012 Doug Zongker <dougz@android.com> Merge "support "sideload over ADB" mode"
9270a20a801403c9f60d6a701b39eae70d380403 10-Jan-2012 Doug Zongker <dougz@android.com> support "sideload over ADB" mode

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
ndroid.mk
db_install.cpp
db_install.h
efault_device.cpp
evice.h
inadbd/Android.mk
inadbd/README.txt
inadbd/adb.c
inadbd/adb.h
inadbd/fdevent.c
inadbd/fdevent.h
inadbd/mutex_list.h
inadbd/services.c
inadbd/sockets.c
inadbd/sysdeps.h
inadbd/transport.c
inadbd/transport.h
inadbd/transport_usb.c
inadbd/usb_linux_client.c
inadbd/utils.c
inadbd/utils.h
ecovery.cpp
0a7b45acd13faadd64c607c8dece3a7ee9e445d3 10-Jan-2012 Dima Zavin <dima@android.com> recovery: convert all usages of $prop to ${prop}

Change-Id: I9451b8350d33806097598fb9e575b28fd8b292ad
Signed-off-by: Dima Zavin <dima@android.com>
tc/init.rc
e6ef63f9e452772198af1ae568f6a85177201df0 08-Jan-2012 Steve Block <steveblock@google.com> Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

See https://android-git.corp.google.com/g/#/c/157220

Bug: 5449033
Change-Id: I9ef9f808a852c36903c8afc40136c89c9ec07630
tdutils/flash_image.c
210f887382e0fd7e51ec6ce071972374a76f0722 06-Jan-2012 Steve Block <steveblock@google.com> Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE

See https://android-git.corp.google.com/g/157065

Bug: 5449033
Change-Id: If6c6ea354caf02fb3bf155931b23e4a6d2f751e9
tdutils/flash_image.c
adb5c2fbc9b5ff025a688c073eccd00967f803f5 04-Jan-2012 Steve Block <steveblock@google.com> Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE

See https://android-git.corp.google.com/g/156801

Bug: 5449033
Change-Id: I3b4ea2184555bc0b570ec858601d4c43ecffb6f8
tdutils/flash_image.c
d9428e3d3e2b94812bb8c2363fc1fde03c906a82 14-Dec-2011 Doug Zongker <dougz@android.com> mount cache before sideloading from external storage

Some packages expect to find cache mounted, since it always is for
"real" OTAs.

Bug: 5739915
Change-Id: I7a7cdd88a60c61e4bc7dc3e1f99956f6487c42e1
ecovery.cpp
4029fb37ada8a20bfe8c73e176f33bcecd3ba11d 09-Dec-2011 The Android Open Source Project <initial-contribution@android.com> am 9fc3e3c8: Reconcile with ics-mr1-release

* commit '9fc3e3c8a6a5f2f82d5712805e90a9c89f914efa':
9fc3e3c8a6a5f2f82d5712805e90a9c89f914efa 08-Dec-2011 The Android Open Source Project <initial-contribution@android.com> Reconcile with ics-mr1-release

Change-Id: I74a51ed7639683e0ab67c922b954eb1391dd2a49
32a0a47a596509792fde8cdbf8b4b0705708b2be 01-Nov-2011 Doug Zongker <dougz@android.com> move key processing to RecoveryUI

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
ndroid.mk
ommon.h
ecovery.cpp
creen_ui.cpp
creen_ui.h
i.cpp
i.h
erifier_test.cpp
d538eb77ca0624514629c6e2c764b4e7470bc202 01-Nov-2011 Doug Zongker <dougz@android.com> fix verifier test

Needs to link with libminui and ui.cpp now.

Change-Id: I5005e12cf8adb13d320921e3f9174e8c7304d7bf
ndroid.mk
erifier_test.cpp
a4e88e45de998520ec0fcc698c74968070b506bb 01-Nov-2011 Doug Zongker <dougz@android.com> move key processing to RecoveryUI

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
ndroid.mk
ommon.h
ecovery.cpp
creen_ui.cpp
creen_ui.h
i.cpp
i.h
daefc1d442fb421606680feb9aeb59c133f4c427 31-Oct-2011 Doug Zongker <dougz@android.com> C++ class for device-specific code

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
ndroid.mk
efault_device.cpp
efault_recovery_ui.c
evice.h
ecovery.cpp
ecovery_ui.h
creen_ui.cpp
creen_ui.h
i.h
pdater/install.c
erifier_test.cpp
5e12cc31f0674d7f42e5925784ada0b00a99a418 31-Oct-2011 Doug Zongker <dougz@android.com> Merge "verifier_test needs to provide a UI object" into ics-aah
bd8e7fbb1a070690d80a399537d62cc88f3423c0 31-Oct-2011 Doug Zongker <dougz@android.com> verifier_test needs to provide a UI object

Change-Id: Iddbb6f0aefdcbd131457690fddeddb0a873ea856
erifier_test.cpp
b88aea8a89f9d3344022cdfe895397baac6c05e7 31-Oct-2011 Doug Zongker <dougz@android.com> temporarily remove verifier_test binary

Change-Id: I61f249861b27180225fb786901275d2da611531b
ndroid.mk
211aebc4e09ce7ca37003be4f01c83111cf0bb49 29-Oct-2011 Doug Zongker <dougz@android.com> refactor ui functions into a class

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
ndroid.mk
nstall.cpp
ecovery.cpp
creen_ui.cpp
creen_ui.h
i.cpp
i.h
erifier.cpp
7d0542f28045640dfab6a259ae7bd796e653d66f 31-Oct-2011 Doug Zongker <dougz@android.com> C++ class for device-specific code

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
ndroid.mk
efault_device.cpp
efault_recovery_ui.c
evice.h
ecovery.cpp
ecovery_ui.h
creen_ui.cpp
creen_ui.h
i.h
pdater/install.c
0890a0ce8ecc47afb1f892dcd770e8dc519add14 31-Oct-2011 The Android Open Source Project <initial-contribution@android.com> Reconcile with ics-mr1-release

Change-Id: I29287109bc555579a9c66b586a3636ba41be5c57
28ce47cfa6919518a8c298088bf08b03bb374c0f 28-Oct-2011 Doug Zongker <dougz@android.com> turn recovery into a C++ binary

Change-Id: I423a23581048d451d53eef46e5f5eac485b77555
ndroid.mk
ootloader.c
ootloader.cpp
ootloader.h
ommon.h
nstall.c
nstall.cpp
nstall.h
inui/minui.h
inzip/DirUtil.h
inzip/Zip.h
tdutils/mounts.h
tdutils/mtdutils.h
ecovery.c
ecovery.cpp
ecovery_ui.h
oots.c
oots.cpp
oots.h
i.c
i.cpp
i.h
erifier.c
erifier.cpp
erifier_test.c
erifier_test.cpp
erifier_test.sh
7440630caa77869e7d264dfb9da47db2182524a2 29-Oct-2011 Doug Zongker <dougz@android.com> refactor ui functions into a class

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
ndroid.mk
nstall.cpp
ecovery.cpp
creen_ui.cpp
creen_ui.h
i.cpp
i.h
erifier.cpp
10e418d3c89ec404fbf959c1ef77a720a42a66ed 28-Oct-2011 Doug Zongker <dougz@android.com> turn recovery into a C++ binary

Change-Id: I68a67a4c8edec9a74463b3d4766005ce27b51316
ndroid.mk
ootloader.c
ootloader.cpp
ootloader.h
ommon.h
nstall.c
nstall.cpp
nstall.h
inui/minui.h
inzip/DirUtil.h
inzip/Zip.h
tdutils/mounts.h
tdutils/mtdutils.h
ecovery.c
ecovery.cpp
ecovery_ui.h
oots.c
oots.cpp
oots.h
i.c
i.cpp
i.h
erifier.c
erifier.cpp
erifier_test.c
erifier_test.cpp
erifier_test.sh
fadc5ac81d6400ebdd041f7d4ea64021596d6b7d 23-Oct-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
d0181b8fcdac761afec252151a8bfda116916e96 19-Oct-2011 Doug Zongker <dougz@android.com> allow recovery packages to wipe cache

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
nstall.c
nstall.h
ecovery.c
pdater/install.c
cf9488aabffb25170f36add98ffb38059a956cb1 16-Oct-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
441031dadc4f5e8c1487468229781702bc08fb14 13-Oct-2011 Dima Zavin <dima@android.com> minui: add ability to synchronize current key state

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>
inui/events.c
inui/minui.h
296955c405dde0ed6130fd75cd09e1d74ae6a800 28-Sep-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
f6abd409bb2b80dfa0c1c03c26bc83141f52c673 27-Sep-2011 Doug Zongker <dougz@android.com> fix problem where the screen is sometimes all black in recovery

Change-Id: Ifa0b59e43eaf0bea9435aa4d96c5b0fc4f10fbfe
inui/graphics.c
14683023a73a4dd654dbb4fe0e018109aeda5c08 21-Sep-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
fdfb636336dd848621e1a1401b1cd1ef29a0a060 20-Sep-2011 Doug Zongker <dougz@android.com> update recovery with new 3D images

Change-Id: I6d52fd1db27fdf1b61f41f598a2209b70385b106
es/images/icon_error.png
es/images/icon_installing.png
es/images/icon_installing_overlay01.png
es/images/icon_installing_overlay02.png
es/images/icon_installing_overlay03.png
es/images/icon_installing_overlay04.png
es/images/icon_installing_overlay05.png
es/images/icon_installing_overlay06.png
es/images/icon_installing_overlay07.png
i.c
512d1239bd65d1d730eac609fd687690639ab07d 05-Sep-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
88e0899617229db57ae2c616fddcf40543c8e392 02-Sep-2011 Dima Zavin <dima@android.com> minui: events: only open input devices with EV_KEY and/or EV_REL

Change-Id: I8283d7aaa0f66d488f462cd108350cc49657a745
Signed-off-by: Dima Zavin <dima@android.com>
inui/events.c
365836736cfbf6b69f76b6d698b2a0beef935478 02-Sep-2011 Dima Zavin <dima@android.com> minui: events: add ability to poll on non-input fds

Change-Id: Iad52a6f2adcae0068d252d6163586f9d7b93121d
Signed-off-by: Dima Zavin <dima@android.com>
inui/events.c
inui/minui.h
bc29063bf4e2312133d91e211dfe9c86ee811489 30-Aug-2011 Dima Zavin <dima@android.com> minui: events: refactor event acquisition

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>
inui/events.c
inui/minui.h
i.c
4daf48a10bcba1fa92b8b3564504b90807c72274 30-Aug-2011 Dima Zavin <dima@android.com> minui: graphics: add interface for framebuffer blank/unblank

Change-Id: I5c3ee61cbf6fadae50f10b9f2e73caceaa5048a7
Signed-off-by: Dima Zavin <dima@android.com>
inui/graphics.c
inui/minui.h
3c7f00ede67113e0de6da214caa6c99ce8eab95c 30-Aug-2011 Dima Zavin <dima@android.com> minui: graphics: add ability to query font size

Change-Id: I5e8f477b7b205794f2975f12e6b6010c177f6052
Signed-off-by: Dima Zavin <dima@android.com>
inui/graphics.c
inui/minui.h
20b8c9479e2b09f676980c48ae8da8d4db40ca28 22-Aug-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
c2ddaea83a75bf324ab729aa2b66036680eedb2c 20-Aug-2011 Doug Zongker <dougz@android.com> change recovery images to match blue holo theme

Change-Id: I912d3ab32973c5c5e7b6b1749698f8a71d884fa3
es/images/icon_error.png
es/images/icon_installing.png
es/images/icon_installing_overlay01.png
es/images/icon_installing_overlay02.png
es/images/icon_installing_overlay03.png
es/images/icon_installing_overlay04.png
es/images/icon_installing_overlay05.png
es/images/icon_installing_overlay06.png
es/images/icon_installing_overlay07.png
es/images/indeterminate01.png
es/images/indeterminate02.png
es/images/indeterminate03.png
es/images/indeterminate04.png
es/images/indeterminate05.png
es/images/indeterminate06.png
es/images/progress_empty.png
es/images/progress_fill.png
i.c
5af4973e9a3c6778d962a275878ddad7845f29c0 15-Jul-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
6242a8bc9b01786e4b58ed897858f593d1d546cf 15-Jul-2011 Michael Ward <mikeward@google.com> Support multiple recovery updater extensions.

Change-Id: I787c086223b674050c0a12fc575add9badb471af
pdater/Android.mk
969fb2fef50a9e11dbb20c347f07dee73040d257 14-Jul-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
8918673cf79f20f0fd9cb735c3ed3510842fc625 14-Jul-2011 Doug Zongker <dougz@android.com> Merge "Check pointer for null before dereferencing"
b2ceb696d02ab0f9f297033820a51fdeac12c0af 14-Jul-2011 Adam Bliss <abliss@google.com> Check pointer for null before dereferencing

Change-Id: Ie7563bf8fb2d627454010de7388d0992e2accf91
ootloader.c
f6e6a04875628a2ab76a5d789f5c07bae97158fc 13-Jul-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
8d92ae052e3b244f8a1e5c36ecae1c7268f82a9f 13-Jul-2011 Benoit Goby <benoit@android.com> Merge "Update usb_connected() to support new gadget driver"
7e6067e36cb311b31ef2c436287282270a6accbf 25-Jun-2011 Benoit Goby <benoit@android.com> Update usb_connected() to support new gadget driver

Change-Id: Iabe8be5bbfa7d2bf1d13280c8734ff75b62a152f
i.c
b0462e6ae2338f1fa7cc0ed7aa36887713185a15 12-Jul-2011 Jeff Brown <jeffbrown@google.com> Remove the simulator target from all makefiles.
Bug: 5010576

Change-Id: Ib465fdb42c8621899bea15c04a427d7ab1641a8c
ndroid.mk
pplypatch/Android.mk
tdutils/Android.mk
ools/ota/Android.mk
97670528d840200e677b57cad0be5b8442e1bfb9 08-Jul-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
933487868f15f3f380efd71dcd0b7c3b744a73d6 07-Jul-2011 Michael Ward <mikeward@google.com> Add missing commands to recovery init.rc

Wrote some missing items in recovery, most notably the serial number so that it shows up correctly on adb.

Change-Id: If430c0b78191c8d77f781aa605b5081571451775
tc/init.rc
36c5bcb1cf0744de44d0367b9e4947cbeab54eaf 30-Jun-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
718a2f7872edcb82e66be8e789c4727e8478d73f 29-Jun-2011 Mike Lockwood <lockwood@android.com> init.rc: Simplify logic for starting adbd in recovery

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>
tc/init.rc
57a53ca9b5394628ebdbcad8a589cc41daf1884a 27-Jun-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
d4103181f39d7dbff3c045a2f55fae3ce61f90ac 24-Jun-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
04b1640e8c6a28b5a9c5d10cd23046f8dd4601a8 24-Jun-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
9d2629c1c40a3469aa28fb8c93c81f76ab46dc94 24-Jun-2011 Michael Ward <mikeward@google.com> Allow applying an OTA package manually from cache.

Change-Id: I8f78377555c658a992ca95cadf11b67ddc93fed8
efault_recovery_ui.c
ecovery.c
ecovery_ui.h
3dbe66b71d38e9edd8cf9afcbc02c264addbec89 24-Jun-2011 Michael Ward <mikeward@google.com> Get the correct line_length.

Set the BPP and other fields and write it back, so the line_length comes back correctly.

Change-Id: I85e4e8223c79b9394ae1fb609b3026de62027ab8
inui/graphics.c
fb04b87002f54935c6b2edf59123525377d4cce6 24-Jun-2011 Doug Zongker <dougz@android.com> fix adb root in recovery

recovery's init.rc was missing lines that made adb root work.

Change-Id: I300e6997e3b5cb9c7b542b2012eed61deb2550f1
tc/init.rc
33cff943e9007997a50f91ceb197c473f1924b54 23-Jun-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
9d1bcdf7b8c2992e9671f7fb9dcf78f2a0ae3d66 22-Jun-2011 Michael Ward <mikeward@google.com> Graphics can handle stride != xres, and BGRA support.

Change-Id: Ifee94ac08028e62a40241a089ac7c36346fea3a3
inui/Android.mk
inui/graphics.c
c726175c3c56f155292455721c396218aa706fcc 21-Jun-2011 The Android Automerger <android-build@android.com> merge in ics-release history after reset to master
1fe452c4379ccd798034963c282d3659ff00ca8e 19-Jun-2011 Mike Lockwood <lockwood@android.com> Fix starting adb in recovery mode

Change-Id: I8444f44d3194ff16ce54121633d5b255231393f5
Signed-off-by: Mike Lockwood <lockwood@android.com>
tc/init.rc
7e58b65efbea7a49f95feb0a697e18940cfda2e7 19-Jun-2011 Mike Lockwood <lockwood@android.com> Fix starting adb in recovery mode

Change-Id: I8444f44d3194ff16ce54121633d5b255231393f5
Signed-off-by: Mike Lockwood <lockwood@android.com>
tc/init.rc
5a4e03d120767e4e183e994bf9939463303057f8 08-Jun-2011 Jean-Baptiste Queru <jbq@google.com> am f84b2524: am 6ebedf00: am 82da01d6: Merge from gingerbread

* commit 'f84b25243d7ebeaca8424171f5ca3b192cc76d80':
7f72ad7934d048a6fda0ff1ac781c2166f4ea25d 08-Jun-2011 Jean-Baptiste Queru <jbq@google.com> am a94d9548: am 1117c69f: am 7172eb7b: Merge "Mute unharmful build warning at the top of the build log:" into gingerbread

* commit 'a94d954862fab26f6159ed7bb836ba6758a569fd':
Mute unharmful build warning at the top of the build log:
f84b25243d7ebeaca8424171f5ca3b192cc76d80 07-Jun-2011 Jean-Baptiste Queru <jbq@google.com> am 6ebedf00: am 82da01d6: Merge from gingerbread

* commit '6ebedf0053ccefd414e5887db316f84bd8f6c44c':
a94d954862fab26f6159ed7bb836ba6758a569fd 07-Jun-2011 Jean-Baptiste Queru <jbq@google.com> am 1117c69f: am 7172eb7b: Merge "Mute unharmful build warning at the top of the build log:" into gingerbread

* commit '1117c69fe40dccfa6090d184094c4a6d407ab8d6':
Mute unharmful build warning at the top of the build log:
6ebedf0053ccefd414e5887db316f84bd8f6c44c 01-Jun-2011 Jean-Baptiste Queru <jbq@google.com> am 82da01d6: Merge from gingerbread

* commit '82da01d6a32c4fbfe57155c119d4669d7faba438':
82da01d6a32c4fbfe57155c119d4669d7faba438 01-Jun-2011 Jean-Baptiste Queru <jbq@google.com> Merge from gingerbread

Change-Id: I30902cdb19698f88a1ea57cf8c7667ef867d13a8
1117c69fe40dccfa6090d184094c4a6d407ab8d6 01-Jun-2011 Jean-Baptiste Queru <jbq@google.com> am 7172eb7b: Merge "Mute unharmful build warning at the top of the build log:" into gingerbread

* commit '7172eb7b623f4b30f5a709d639fcd3fb51cd6220':
Mute unharmful build warning at the top of the build log:
7172eb7b623f4b30f5a709d639fcd3fb51cd6220 31-May-2011 Jean-Baptiste Queru <jbq@google.com> Merge "Mute unharmful build warning at the top of the build log:" into gingerbread
b7b7b37457ab4070a9f9f645501a236d38fd1a07 25-May-2011 Ying Wang <wangying@android.com> 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
pdater/Android.mk
28a08efe15fc14bf1f4937024d4b73cf299313e5 20-May-2011 The Android Open Source Project <initial-contribution@android.com> Reconcile with honeycomb-release

Change-Id: I1205ca405fdaf586ebc349fbe83969e9694fab60
e44b41a770a60444c8fdbd75246373648ef44ff5 09-May-2011 The Android Automerger <android-build@android.com> am c2a158db: Merge remote branch \'goog/honeycomb-mr2\' into honeycomb-LTE

* commit 'c2a158db9588e6ad290dd0f9171a190609900387':
delay accessing misc partition until its device exists
c2a158db9588e6ad290dd0f9171a190609900387 09-May-2011 The Android Automerger <android-build@android.com> Merge remote branch 'goog/honeycomb-mr2' into honeycomb-LTE
c636b7300b819d2aa955f6ef2a75be706d686c74 04-May-2011 Doug Zongker <dougz@android.com> am 90588820: delay accessing misc partition until its device exists

* commit '90588820b7110acf142d17457f0d10cd7cb57a8a':
delay accessing misc partition until its device exists
90588820b7110acf142d17457f0d10cd7cb57a8a 22-Apr-2011 Doug Zongker <dougz@android.com> 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
ootloader.c
f4bb554ee994ce3ecff43f0d6db040c7b1d53a33 22-Apr-2011 Doug Zongker <dougz@android.com> 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
ootloader.c
cfd256a3328aac1199a35825b5daf04f5f4fc112 22-Apr-2011 Doug Zongker <dougz@android.com> 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: Ib9bf6c35fa2c28fc43aa7550aaaffb76c9f6e120
ootloader.c
179b2d989532afe14a88d57c3d1533b8cfe76cb9 13-Apr-2011 Doug Zongker <dougz@android.com> make write_raw_image able to take a blob

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
pdater/install.c
469243e53689b6f312d20813444dc00d83528758 12-Apr-2011 Doug Zongker <dougz@android.com> save a last_install file with the result of the last package install attempt

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
ommon.h
nstall.c
ecovery.c
oots.c
3ed8e187212b06767e0ca5860cdbd79c11c9390e 15-Mar-2011 Doug Zongker <dougz@android.com> am 4762633c: log which key a package verified against in recovery

* commit '4762633cf846d17516878303502b056b52353a5d':
log which key a package verified against in recovery
4762633cf846d17516878303502b056b52353a5d 15-Mar-2011 Doug Zongker <dougz@android.com> log which key a package verified against in recovery

Change-Id: I0d91b715d1eb9e45e2fce54bb93ba0abef92727e
erifier.c
201aa88cbaa3db032a6a1fdab55bae128e7a04ab 12-Mar-2011 Iliyan Malchev <malchev@google.com> recovery: mount /sdcard read-only

Change-Id: Ieffafe00cf82620057cacd0629cb60b0e6aad817
Signed-off-by: Iliyan Malchev <malchev@google.com>
oots.c
90415aca670f0d0475a71634880e7c5c81c007c0 11-Mar-2011 Ken Sumrall <ksumrall@android.com> am 6e4472ab: Have recovery reboot using the new android_reboot() function.

* commit '6e4472abbd3c7be9cd31d98a03df1e3b6fa92f40':
Have recovery reboot using the new android_reboot() function.
6e4472abbd3c7be9cd31d98a03df1e3b6fa92f40 08-Mar-2011 Ken Sumrall <ksumrall@android.com> 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
ecovery.c
i.c
f66088d2cef72bbb89737b846792c52c5167c7bc 09-Mar-2011 Doug Zongker <dougz@android.com> am 6ce4a326: don\'t reboot for inactivity if USB is connected

* commit '6ce4a326efae4abb108e19899f4d7776abc362da':
don't reboot for inactivity if USB is connected
6ce4a326efae4abb108e19899f4d7776abc362da 08-Mar-2011 Doug Zongker <dougz@android.com> don't reboot for inactivity if USB is connected

(Cherry-pick back from master.)

Bug: 4071007
Change-Id: I28355c593770df678968185171bdd19dabe7f062
i.c
4cc533dd1c946664df1cd7386f60d37fd16c2668 08-Mar-2011 Doug Zongker <dougz@android.com> don't reboot for inactivity if USB is connected

Change-Id: Icba35da91167d30c446581afb47d0804e49964bf
i.c
b70fe3f76a45f810bdf0934a151334d4343eb056 08-Mar-2011 Doug Zongker <dougz@android.com> am 68189f29: allow paletted RGB images in recovery

* commit '68189f2994690538b6e3bddc3788cb092cbda088':
allow paletted RGB images in recovery
68189f2994690538b6e3bddc3788cb092cbda088 05-Mar-2011 Doug Zongker <dougz@android.com> 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
inui/resources.c
7e69e2cccc5889f56dc3ff1b10b109c25b7ef100 04-Mar-2011 Eric Fischer <enf@google.com> Merge branch 'master' of ssh://android-git:29418/platform/bootable/recovery
73bb6f749f7f70f1cba2b84d821ac7400c24fbbc 03-Mar-2011 Doug Zongker <dougz@android.com> convert recovery images to palettized PNGs

Cuts the byte size of the recovery images in half, roughly.

Change-Id: I3c45b5e58423b57faca83fc67b4e24e8d643c5b1
es/images/icon_error.png
es/images/icon_installing.png
es/images/icon_installing_overlay01.png
es/images/icon_installing_overlay02.png
es/images/icon_installing_overlay03.png
es/images/icon_installing_overlay04.png
es/images/icon_installing_overlay05.png
es/images/icon_installing_overlay06.png
es/images/icon_installing_overlay07.png
b7c91766da97adabda4e6fd459ff2e87eb87d835 03-Mar-2011 Doug Zongker <dougz@android.com> convert recovery images to palettized PNGs

Cuts the byte size of the recovery images in half, roughly.

Change-Id: I453a499e9937163c545dab3c552201882766e218
es/images/icon_error.png
es/images/icon_installing.png
es/images/icon_installing_overlay01.png
es/images/icon_installing_overlay02.png
es/images/icon_installing_overlay03.png
es/images/icon_installing_overlay04.png
es/images/icon_installing_overlay05.png
es/images/icon_installing_overlay06.png
es/images/icon_installing_overlay07.png
be6d4d10529860037c165e4441a2d23f539e7b00 02-Mar-2011 Doug Zongker <dougz@android.com> change the default recovery assets to be in holograph style

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
ake-overlay.py
es/images/icon_error.png
es/images/icon_installing.png
es/images/icon_installing_overlay01.png
es/images/icon_installing_overlay02.png
es/images/icon_installing_overlay03.png
es/images/icon_installing_overlay04.png
es/images/icon_installing_overlay05.png
es/images/icon_installing_overlay06.png
es/images/icon_installing_overlay07.png
es/images/indeterminate01.png
es/images/indeterminate02.png
es/images/indeterminate03.png
es/images/indeterminate04.png
es/images/indeterminate05.png
es/images/indeterminate06.png
es/images/indeterminate1.png
es/images/indeterminate2.png
es/images/indeterminate3.png
es/images/indeterminate4.png
es/images/indeterminate5.png
es/images/indeterminate6.png
es/images/progress_empty.png
es/images/progress_fill.png
i.c
6809c51f8db86f1ab00a076cf570439d11920d3a 01-Mar-2011 Doug Zongker <dougz@android.com> make recovery UI images more general; allow for installation animation

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
ommon.h
efault_recovery_ui.c
inui/resources.c
ecovery.c
ecovery_ui.h
i.c
c007b961d7ed28388fca00a779b846b8646a9cf8 25-Feb-2011 Doug Zongker <dougz@android.com> am 8d43d940: am 2c273f00: store partition length in recovery.fstab

* commit '8d43d94065e88e00e1460841b43c7de584ee5585':
store partition length in recovery.fstab
ee458bbf9b68c70cad80323bb4e1c816e88e36ec 18-Feb-2011 Doug Zongker <dougz@android.com> store partition length in recovery.fstab

Don't hardcode magical partition behavior in roots.c.

Change-Id: I587fc2c066575b51c11efd2e45a50f5b864df484
ommon.h
oots.c
8d43d94065e88e00e1460841b43c7de584ee5585 25-Feb-2011 Doug Zongker <dougz@android.com> am 2c273f00: store partition length in recovery.fstab

* commit '2c273f004e0504ae0389ad160ed2a92624873189':
store partition length in recovery.fstab
2c273f004e0504ae0389ad160ed2a92624873189 18-Feb-2011 Doug Zongker <dougz@android.com> store partition length in recovery.fstab

Don't hardcode magical partition behavior in roots.c.

Change-Id: I587fc2c066575b51c11efd2e45a50f5b864df484
ommon.h
oots.c
2810ceda34604f605f781691689c0559e03cb357 18-Feb-2011 Doug Zongker <dougz@android.com> store partition length in recovery.fstab

Don't hardcode magical partition behavior in roots.c.

Change-Id: I587fc2c066575b51c11efd2e45a50f5b864df484
ommon.h
oots.c
4c05d9511298d24b49ab595814fc9f1894cf6a90 09-Feb-2011 Ying Wang <wangying@google.com> Fix x86 build.

Change-Id: Iada6268b0a72ee832113ea397334cc7950a37051
ndroid.mk
pplypatch/Android.mk
tdutils/Android.mk
6da1abbc387d51eb795628fb690d333f10f28408 25-Jan-2011 Doug Zongker <dougz@android.com> am 5df22d03: am 5cae445e: make recovery reboot after 2 minutes of no activity

* commit '5df22d03d2e7c6de213d83a58e0af39c42f839ca':
make recovery reboot after 2 minutes of no activity
5df22d03d2e7c6de213d83a58e0af39c42f839ca 25-Jan-2011 Doug Zongker <dougz@android.com> am 5cae445e: make recovery reboot after 2 minutes of no activity

* commit '5cae445e43c5928daba0a76745b0dd2657274eda':
make recovery reboot after 2 minutes of no activity
5cae445e43c5928daba0a76745b0dd2657274eda 25-Jan-2011 Doug Zongker <dougz@android.com> 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
ommon.h
ecovery.c
i.c
80abd51dbcf5869d3ef4ddfc88f538c42697c39e 22-Jan-2011 Doug Zongker <dougz@android.com> am da993fcf: am 8d58c957: Merge "Free allocated struct after freeing field"

* commit 'da993fcf2665102435b05d6b20a4c4e8f8bd3b8f':
Free allocated struct after freeing field
da993fcf2665102435b05d6b20a4c4e8f8bd3b8f 22-Jan-2011 Doug Zongker <dougz@android.com> am 8d58c957: Merge "Free allocated struct after freeing field"

* commit '8d58c957036835db148acc4e506633a016dc6c7e':
Free allocated struct after freeing field
1966aaf4e6a571d98f9f0e523b32f68435a79bf4 21-Jan-2011 Doug Zongker <dougz@android.com> Merge "remove encrypted filesystem code from recovery"
8d58c957036835db148acc4e506633a016dc6c7e 20-Jan-2011 Doug Zongker <dougz@android.com> Merge "Free allocated struct after freeing field"
8f132ed870b4b83727d59f8019b8fabe49fe8ed4 15-Jan-2011 Ken Sumrall <ksumrall@android.com> Reserve the last 16 Kbytes of /data for the crypto footer.

When formatting /data, if it's an ext4 filesystem, reserve the
last 16 Kbytes for the crypto footer.

Change-Id: I7b401d851ee87732e5da5860df0287a1c331c5b7
oots.c
pdater/install.c
862c83bb3121de3e3fd4a9c7ebdb8ae627f8d311 19-Jan-2011 Christian Lindeberg <christian.lindeberg@sonyericsson.com> Free allocated struct after freeing field

Free allocated MtdReadContext after freeing buffer field in struct,
not before.

Change-Id: I237920dc36115389cd2d6948e7a962dbec22fe56
tdutils/mtdutils.c
540d57f25adc24d55eb233799bc474935d65911c 18-Jan-2011 Doug Zongker <dougz@android.com> remove encrypted filesystem code from recovery

This was never used; encrypted filesystems are being done a different
way now.

Change-Id: I519c57b9be44d001f0b81516af7bfc252069892b
ndroid.mk
ncryptedfs_provisioning.c
ncryptedfs_provisioning.h
ecovery.c
be3e6f13b810046fb1981b21d9e6f0715ae67a22 14-Jan-2011 Doug Zongker <dougz@android.com> option to allow recovery to use 24-bit graphics in UI

Add "RECOVERY_24_BIT := true" to the device's BoardConfig.mk to use
24-bit framebuffers in the recovery ui.

Change-Id: Iaede138bf7870becf237f12f1c0e49c9ff82d007
inui/Android.mk
inui/graphics.c
49396b79b5aa49db55b5325255fb07eb21c069cd 06-Jan-2011 Colin Cross <ccross@android.com> Update make_ext4fs arguments in roots.c

Change-Id: I835e55fb80add6a74cd4d99f77b2528829d9a349
oots.c
264f549b7d5aa5846e691dfe8aa9254fa4dbdc0b 29-Dec-2010 Colin Cross <ccross@android.com> Update arguments to make_ext4fs

Change-Id: Id96e98da76b3091987b01651f980797b1d6b49d8
pdater/install.c
70f7e8dbf0c56f55bdeb2fe563c4f49da165d16d 04-Nov-2010 Doug Zongker <dougz@android.com> am c5ebf1fb: am 5d6309e7: fix comparison of ECC stats before and after mtd reads

* commit 'c5ebf1fba2f870a4e9453721112900975c18e083':
fix comparison of ECC stats before and after mtd reads
c5ebf1fba2f870a4e9453721112900975c18e083 03-Nov-2010 Doug Zongker <dougz@android.com> am 5d6309e7: fix comparison of ECC stats before and after mtd reads

* commit '5d6309e77f6055a9aec062dd991d071054726ebb':
fix comparison of ECC stats before and after mtd reads
5d6309e77f6055a9aec062dd991d071054726ebb 03-Nov-2010 Doug Zongker <dougz@android.com> 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
tdutils/mtdutils.c
02971af254e72d175832854501c0a19e3f06d491 01-Nov-2010 Doug Zongker <dougz@android.com> am 8521ef59: am 51266d13: clear recovery framebuffers on allocation; display icon right after ui_init

* commit '8521ef5965675da85c7bbbe9c8b86fe68716e855':
clear recovery framebuffers on allocation; display icon right after ui_init
8521ef5965675da85c7bbbe9c8b86fe68716e855 01-Nov-2010 Doug Zongker <dougz@android.com> am 51266d13: clear recovery framebuffers on allocation; display icon right after ui_init

* commit '51266d1397309978eac9b2e96035582454f0321b':
clear recovery framebuffers on allocation; display icon right after ui_init
51266d1397309978eac9b2e96035582454f0321b 01-Nov-2010 Doug Zongker <dougz@android.com> 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
inui/graphics.c
ecovery.c
7c3ee270ce65b2ff2e234a259bc5b69eab5e58dd 30-Sep-2010 Doug Zongker <dougz@android.com> am 2d87023e: am 2c3539e4: save the log from recovery\'s last run in /cache/recovery/last_log

Merge commit '2d87023e77b20aa2196c8ceae833b33040b0dc57'

* commit '2d87023e77b20aa2196c8ceae833b33040b0dc57':
save the log from recovery's last run in /cache/recovery/last_log
2d87023e77b20aa2196c8ceae833b33040b0dc57 29-Sep-2010 Doug Zongker <dougz@android.com> am 2c3539e4: 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
2c3539e4d8251ad91e0b881253d39583680093e8 29-Sep-2010 Doug Zongker <dougz@android.com> 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
ecovery.c
1a32732db2309bf74f180f2b1cc40c03d621cf13 22-Sep-2010 Doug Zongker <dougz@android.com> am 704fa750: am 9b125b04: handle old-style CACHE: packages

Merge commit '704fa75024467fb4e362537f7c341eb056e283b5'

* commit '704fa75024467fb4e362537f7c341eb056e283b5':
handle old-style CACHE: packages
704fa75024467fb4e362537f7c341eb056e283b5 22-Sep-2010 Doug Zongker <dougz@android.com> am 9b125b04: handle old-style CACHE: packages

Merge commit '9b125b04c6ba8f07d8aa6494d58917a596443dc5' into gingerbread-plus-aosp

* commit '9b125b04c6ba8f07d8aa6494d58917a596443dc5':
handle old-style CACHE: packages
9b125b04c6ba8f07d8aa6494d58917a596443dc5 22-Sep-2010 Doug Zongker <dougz@android.com> handle old-style CACHE: packages

Change-Id: I7bf52b56770c207ba1c8329243991b07ebb65779
ecovery.c
6b26c882a883b43d199bc2882cf574c651da0408 22-Sep-2010 Doug Zongker <dougz@android.com> am af78591c: am 2c3c5c15: Merge "mount sdcard only on demand; fix sideload installs" into gingerbread

Merge commit 'af78591c9a2aa8379c2d8528c31ea1eb813f6cae'

* commit 'af78591c9a2aa8379c2d8528c31ea1eb813f6cae':
mount sdcard only on demand; fix sideload installs
af78591c9a2aa8379c2d8528c31ea1eb813f6cae 22-Sep-2010 Doug Zongker <dougz@android.com> am 2c3c5c15: Merge "mount sdcard only on demand; fix sideload installs" into gingerbread

Merge commit '2c3c5c15d15faf1c9fa074851c57d0afa2a40d28' into gingerbread-plus-aosp

* commit '2c3c5c15d15faf1c9fa074851c57d0afa2a40d28':
mount sdcard only on demand; fix sideload installs
2c3c5c15d15faf1c9fa074851c57d0afa2a40d28 22-Sep-2010 Doug Zongker <dougz@android.com> Merge "mount sdcard only on demand; fix sideload installs" into gingerbread
c18eeb874b003b53d47b1513d883a63fa352d28b 22-Sep-2010 Doug Zongker <dougz@android.com> mount sdcard only on demand; fix sideload installs

Bug: 3009493
Change-Id: I1a7f99fc41a6a7012742e82f8c06a0c75584890a
ecovery.c
oots.c
3d798835a3ae75fcab044181c5e64b3ad8e27f16 21-Sep-2010 Doug Zongker <dougz@android.com> am 8147ba85: (-s ours) am 93ca4fc6: use fs_type "emmc" instead of "block" for consistency (do not merge)

Merge commit '8147ba850b2e74dc950183e67c77a0da2b1a19b7'

* commit '8147ba850b2e74dc950183e67c77a0da2b1a19b7':
use fs_type "emmc" instead of "block" for consistency (do not merge)
8147ba850b2e74dc950183e67c77a0da2b1a19b7 21-Sep-2010 Doug Zongker <dougz@android.com> am 93ca4fc6: 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)
93ca4fc6943a3ebf758c5db98531531b8fe92c98 21-Sep-2010 Doug Zongker <dougz@android.com> use fs_type "emmc" instead of "block" for consistency (do not merge)

Change-Id: Iab60665d9c6daef7893896a64b7f319120a5f8ee
ootloader.c
cc8cd3f3cac07f6927ead277ef390c000ae798d9 20-Sep-2010 Doug Zongker <dougz@android.com> remove the notion of "root path"; support mixed flash types

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
ndroid.mk
ootloader.c
ommon.h
ncryptedfs_provisioning.c
nstall.c
ecovery.c
oots.c
oots.h
est_roots.c
0f1ad110f8655d941afefcc57d371ea98c02a7a7 21-Sep-2010 Doug Zongker <dougz@android.com> am 3dba40da: (-s ours) am d4208f9f: remove the notion of "root path"; support mixed flash types (do not merge)

Merge commit '3dba40da1e533c6f419857e4274d9d9dd55868b6'

* commit '3dba40da1e533c6f419857e4274d9d9dd55868b6':
remove the notion of "root path"; support mixed flash types (do not merge)
3dba40da1e533c6f419857e4274d9d9dd55868b6 21-Sep-2010 Doug Zongker <dougz@android.com> am d4208f9f: 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)
d4208f9f9d4e9f268ba1888c1fe879ee73eb7e47 20-Sep-2010 Doug Zongker <dougz@android.com> 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
ndroid.mk
ootloader.c
ommon.h
ncryptedfs_provisioning.c
nstall.c
ecovery.c
oots.c
oots.h
est_roots.c
c9ebb58623430b73e8f5a30c5ac34b770f29359a 18-Sep-2010 Doug Zongker <dougz@android.com> resolved conflicts for merge of 40f0d3b4 to master

Change-Id: If14ab094a8bb11106b0ea7fdf8736e5e4c223089
40f0d3b4e06d915ef8f3ce0adb00eb0d6902b616 17-Sep-2010 Doug Zongker <dougz@android.com> am d7d42089: remove unneeded partition roots

Merge commit 'd7d4208976125d114d0b8e44438e2417d5275098' into gingerbread-plus-aosp

* commit 'd7d4208976125d114d0b8e44438e2417d5275098':
remove unneeded partition roots
d7d4208976125d114d0b8e44438e2417d5275098 17-Sep-2010 Doug Zongker <dougz@android.com> 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
nstall.c
oots.c
oots.h
97e54ef573cab35970574fc7a3790563b4d73ddd 16-Sep-2010 Brian Swetland <swetland@google.com> am 1dcd2fd0: (-s ours) am 792b0071: do not merge - update to match ext4utils api

Merge commit '1dcd2fd0c7cc44cae279a5088241bdf15f084cb8'

* commit '1dcd2fd0c7cc44cae279a5088241bdf15f084cb8':
do not merge - update to match ext4utils api
1dcd2fd0c7cc44cae279a5088241bdf15f084cb8 16-Sep-2010 Brian Swetland <swetland@google.com> am 792b0071: 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
dc49ce453efee52044287a2d0139996952f71170 16-Sep-2010 Doug Zongker <dougz@android.com> add missing sparseness parameter

Change-Id: Ie6e309b127e80cd6475f1deaa5dbadf9f5cc2746
pdater/install.c
792b00712bb1411d3b0583bcea95b43b3107fb95 16-Sep-2010 Brian Swetland <swetland@google.com> do not merge - update to match ext4utils api

Change-Id: I9d34e491022d7dfed653a861b0728a0a656f1fbe
pdater/install.c
6c3e03b3c55e9e8cc11cca9aca71d0a65c8e3d62 16-Sep-2010 Doug Zongker <dougz@android.com> resolved conflicts for merge of 85bcf776 to master

Change-Id: Iab4f25702a5a62b9172f81fd543a8240a0e603c3
a66c32ab1dde5ea8fc5d9fd9450ded267a94c429 16-Sep-2010 Doug Zongker <dougz@android.com> resolved conflicts for merge of 9f89b0e4 to master

Change-Id: Id458df96fd56830fdb35397e95a80274761ecff5
d7693c4c8e0825927fe5d76133fed96b43e60afb 16-Sep-2010 Doug Zongker <dougz@android.com> resolved conflicts for merge of 76445f3a to master

Change-Id: I658894dcaddbf0de428e3c51dbcdc306d3f47a52
6b1ff61f62db82adf8e47c121cd13c29831ad21b 16-Sep-2010 Doug Zongker <dougz@android.com> am 858f0a76: am 8e5e4dad: close update package before installing; allow remount

Merge commit '858f0a763d0f736eb721f54257b6164886bfcbfc'

* commit '858f0a763d0f736eb721f54257b6164886bfcbfc':
close update package before installing; allow remount
4f69afdb631a2480d466505635cde3a1d61e3610 15-Sep-2010 Doug Zongker <dougz@android.com> am bd4bc088: am d12560aa: add the ability to seek to a raw location while reading MTD partition

Merge commit 'bd4bc088e286b87a5d1469598644125ecc0fd547'

* commit 'bd4bc088e286b87a5d1469598644125ecc0fd547':
add the ability to seek to a raw location while reading MTD partition
85bcf776e10ba0788346e3599c7a5d6c0aefa7fc 15-Sep-2010 Doug Zongker <dougz@android.com> am 8a8e6cc3: (cherry-pick) EMMC support in applypatch

Merge commit '8a8e6cc33cc0dcfe7e184b59d5ef1f1c29095509' into gingerbread-plus-aosp

* commit '8a8e6cc33cc0dcfe7e184b59d5ef1f1c29095509':
(cherry-pick) EMMC support in applypatch
9f89b0e4673f0e28066ba41321dc9e626e04c64f 15-Sep-2010 Doug Zongker <dougz@android.com> am 56c5105b: support for ext4/EMMC filesystems in updater binary

Merge commit '56c5105bd7096704eaed35329b2c8c84cc282867' into gingerbread-plus-aosp

* commit '56c5105bd7096704eaed35329b2c8c84cc282867':
support for ext4/EMMC filesystems in updater binary
76445f3aef388aac78369c2107ea61a1638dfa91 15-Sep-2010 Doug Zongker <dougz@android.com> am 8674a726: (cherry-pick) support installing any .zip file on the sdcard

Merge commit '8674a726ff05a4a6c09c6934778c251635f130a8' into gingerbread-plus-aosp

* commit '8674a726ff05a4a6c09c6934778c251635f130a8':
(cherry-pick) support installing any .zip file on the sdcard
8a8e6cc33cc0dcfe7e184b59d5ef1f1c29095509 07-Jul-2010 Doug Zongker <dougz@android.com> (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
pplypatch/applypatch.c
i.c
56c5105bd7096704eaed35329b2c8c84cc282867 01-Jul-2010 Doug Zongker <dougz@android.com> 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.
ommon.h
nstall.c
ecovery.c
i.c
pdater/Android.mk
pdater/install.c
8674a726ff05a4a6c09c6934778c251635f130a8 15-Sep-2010 Doug Zongker <dougz@android.com> (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
ommon.h
efault_recovery_ui.c
ecovery.c
i.c
858f0a763d0f736eb721f54257b6164886bfcbfc 15-Sep-2010 Doug Zongker <dougz@android.com> am 8e5e4dad: close update package before installing; allow remount

Merge commit '8e5e4dada713609c9b2c45ea9cf4572bb89ef761' into gingerbread-plus-aosp

* commit '8e5e4dada713609c9b2c45ea9cf4572bb89ef761':
close update package before installing; allow remount
8e5e4dada713609c9b2c45ea9cf4572bb89ef761 15-Sep-2010 Doug Zongker <dougz@android.com> 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
nstall.c
tdutils/mounts.c
tdutils/mounts.h
tdutils/mtdutils.c
pdater/updater.c
bd4bc088e286b87a5d1469598644125ecc0fd547 15-Sep-2010 Doug Zongker <dougz@android.com> am d12560aa: 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
d12560aa2134d3af21a1220cd4873553f9c51743 14-Sep-2010 Doug Zongker <dougz@android.com> add the ability to seek to a raw location while reading MTD partition

Change-Id: Id1563ca667c50e61cf1bb15d2cf783a50937eece
tdutils/mtdutils.c
tdutils/mtdutils.h
6a84721c7620ef57605c66c05fb6e8d0eff10d0d 12-Sep-2010 Doug Zongker <dougz@android.com> am f94a3575: am 61ba7a83: stop treating all-zero blocks as bad

Merge commit 'f94a3575d76f1fd6df20f82ca28fff688d53cfbc'

* commit 'f94a3575d76f1fd6df20f82ca28fff688d53cfbc':
stop treating all-zero blocks as bad
f94a3575d76f1fd6df20f82ca28fff688d53cfbc 12-Sep-2010 Doug Zongker <dougz@android.com> am 61ba7a83: stop treating all-zero blocks as bad

Merge commit '61ba7a83ef46494689801ddaad569d7d174153b1' into gingerbread-plus-aosp

* commit '61ba7a83ef46494689801ddaad569d7d174153b1':
stop treating all-zero blocks as bad
61ba7a83ef46494689801ddaad569d7d174153b1 12-Sep-2010 Doug Zongker <dougz@android.com> stop treating all-zero blocks as bad

Change-Id: If49fa6485f66598d16a7e44fce3129de55fab422
tdutils/mtdutils.c
0b519b25c3f441703e34854f2feffea90a3a91af 10-Sep-2010 Doug Zongker <dougz@android.com> am a2c9a1e8: am aaf3f56c: block is bad if ioctl() returns nonzero

Merge commit 'a2c9a1e8a2b99bd8197c83b2f749ec61bc0312f8'

* commit 'a2c9a1e8a2b99bd8197c83b2f749ec61bc0312f8':
block is bad if ioctl() returns nonzero
a2c9a1e8a2b99bd8197c83b2f749ec61bc0312f8 10-Sep-2010 Doug Zongker <dougz@android.com> am aaf3f56c: block is bad if ioctl() returns nonzero

Merge commit 'aaf3f56c44c37dca4ef9cc9efde68727ca26105f' into gingerbread-plus-aosp

* commit 'aaf3f56c44c37dca4ef9cc9efde68727ca26105f':
block is bad if ioctl() returns nonzero
aaf3f56c44c37dca4ef9cc9efde68727ca26105f 10-Sep-2010 Doug Zongker <dougz@android.com> block is bad if ioctl() returns nonzero

Change-Id: I6fc4ce796bc663d05035927c0af0ce7ab6d07218
tdutils/mtdutils.c
b56db27d08c168a9167bf2226baaebf24a0fe5aa 03-Sep-2010 Doug Zongker <dougz@android.com> am 28cae98c: am 4bc98062: add --show_text option to recovery

Merge commit '28cae98c834fb4bc47588b34dc3fe19811d5162b'

* commit '28cae98c834fb4bc47588b34dc3fe19811d5162b':
add --show_text option to recovery
28cae98c834fb4bc47588b34dc3fe19811d5162b 03-Sep-2010 Doug Zongker <dougz@android.com> am 4bc98062: add --show_text option to recovery

Merge commit '4bc980626c1cf6f1ea7d36e4b54e0023c896c9de' into gingerbread-plus-aosp

* commit '4bc980626c1cf6f1ea7d36e4b54e0023c896c9de':
add --show_text option to recovery
4bc980626c1cf6f1ea7d36e4b54e0023c896c9de 03-Sep-2010 Doug Zongker <dougz@android.com> add --show_text option to recovery

Change-Id: Ie6c6c920260dfa759fbb15b1f352d6bb0fa7146c
ommon.h
ecovery.c
i.c
5200114fe8c1c1503176c891230200bf8d5ec632 02-Sep-2010 Ying Wang <wangying@google.com> am 4c7c2f73: (-s ours) am 532c8600: Revert 21f0f97ebabb47adcbfe8d38b02685f2019b4eb3

Merge commit '4c7c2f73af773872faf5a65167d74900865d96ba'

* commit '4c7c2f73af773872faf5a65167d74900865d96ba':
Revert 21f0f97ebabb47adcbfe8d38b02685f2019b4eb3
3e115b81a46b849a2b556f5f1202a56bf4884619 02-Sep-2010 Ying Wang <wangying@google.com> am 17b44ee3: (-s ours) am 21f0f97e: Fix for crespo.

Merge commit '17b44ee3d82d7b8efa8dc3bc17d78fee11d72e01'

* commit '17b44ee3d82d7b8efa8dc3bc17d78fee11d72e01':
Fix for crespo.
4c7c2f73af773872faf5a65167d74900865d96ba 01-Sep-2010 Ying Wang <wangying@google.com> am 532c8600: Revert 21f0f97ebabb47adcbfe8d38b02685f2019b4eb3

Merge commit '532c86002bb89db43094b27ec50f001ae173c650' into gingerbread-plus-aosp

* commit '532c86002bb89db43094b27ec50f001ae173c650':
Revert 21f0f97ebabb47adcbfe8d38b02685f2019b4eb3
17b44ee3d82d7b8efa8dc3bc17d78fee11d72e01 01-Sep-2010 Ying Wang <wangying@google.com> am 21f0f97e: Fix for crespo.

Merge commit '21f0f97ebabb47adcbfe8d38b02685f2019b4eb3' into gingerbread-plus-aosp

* commit '21f0f97ebabb47adcbfe8d38b02685f2019b4eb3':
Fix for crespo.
532c86002bb89db43094b27ec50f001ae173c650 01-Sep-2010 Ying Wang <wangying@google.com> Revert 21f0f97ebabb47adcbfe8d38b02685f2019b4eb3

Change-Id: I46e4d7fe76e4219207e46f19e50188e38bb932b7
efault_recovery_ui.c
ecovery.c
i.c
21f0f97ebabb47adcbfe8d38b02685f2019b4eb3 31-Aug-2010 Ying Wang <wangying@google.com> Fix for crespo.

Change-Id: I008510bf614606a46a630c7adc39464ce1143ec3
efault_recovery_ui.c
ecovery.c
i.c
37d58711f63052137e79b4fa319480299de535a6 24-Aug-2010 Jean-Baptiste Queru <jbq@google.com> am 97900287: am 965f9dc4: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward

Merge commit '979002871ddc417dfdfb6a6542b9018626af7883'

* commit '979002871ddc417dfdfb6a6542b9018626af7883':
fix bug in applying patches
remove shadowed variable declaration
979002871ddc417dfdfb6a6542b9018626af7883 24-Aug-2010 Jean-Baptiste Queru <jbq@google.com> am 965f9dc4: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward

Merge commit '965f9dc45345486e885b59b4776f0ca5e765ec20' into gingerbread-plus-aosp

* commit '965f9dc45345486e885b59b4776f0ca5e765ec20':
fix bug in applying patches
remove shadowed variable declaration
965f9dc45345486e885b59b4776f0ca5e765ec20 24-Aug-2010 Jean-Baptiste Queru <jbq@google.com> merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward

Change-Id: I4d56dc0235f3df1306736c42144dccb26b876b74
baf6e35473ee5d0fd34006cd4f821129845b1d31 16-Aug-2010 Doug Zongker <dougz@android.com> am c080bc54: am fbd7ae7a: am 201cd466: remove shadowed variable declaration

Merge commit 'c080bc549aaf272c77fe7903e52c2a2c0d8de1bb'

* commit 'c080bc549aaf272c77fe7903e52c2a2c0d8de1bb':
remove shadowed variable declaration
8101125ee5068aff91f98c042660cb29576b8612 14-Aug-2010 Ken Sumrall <ksumrall@android.com> Changes to work with updated make_ext4fs tool that supports creating sparse images.

An extra parameter was added to the make_ext4fs() function, we these tools need
to be updated to match.

Change-Id: Id640a7f2b03153eb333b00337f0f991ff5332349
oots.c
pdater/install.c
dff87121ad861dc830fc96823725b466d80d1110 13-Aug-2010 Doug Zongker <dougz@android.com> 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
pplypatch/applypatch.c
beecac49da738d164ef524332224a6700791aa1e 13-Aug-2010 Doug Zongker <dougz@android.com> 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
pplypatch/applypatch.c
c080bc549aaf272c77fe7903e52c2a2c0d8de1bb 13-Aug-2010 Doug Zongker <dougz@android.com> am fbd7ae7a: am 201cd466: remove shadowed variable declaration

Merge commit 'fbd7ae7a1ce0060221241ed02c576983c1f48d34' into gingerbread-plus-aosp

* commit 'fbd7ae7a1ce0060221241ed02c576983c1f48d34':
remove shadowed variable declaration
fbd7ae7a1ce0060221241ed02c576983c1f48d34 13-Aug-2010 Doug Zongker <dougz@android.com> am 201cd466: remove shadowed variable declaration

Merge commit '201cd46680f5789e21a57fb4476ab0ba0c0ed4c0' into gingerbread

* commit '201cd46680f5789e21a57fb4476ab0ba0c0ed4c0':
remove shadowed variable declaration
201cd46680f5789e21a57fb4476ab0ba0c0ed4c0 13-Aug-2010 Doug Zongker <dougz@android.com> 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
pplypatch/applypatch.c
80dcee145ff6aa734b611133ef98045f940cf82c 13-Aug-2010 Doug Zongker <dougz@android.com> am c4e32005: am 17986e6b: am 8cd9e4f3: fix bug in applying patches

Merge commit 'c4e3200578ad670bee9f5a88e90e7a77089d5df7'

* commit 'c4e3200578ad670bee9f5a88e90e7a77089d5df7':
fix bug in applying patches
c4e3200578ad670bee9f5a88e90e7a77089d5df7 13-Aug-2010 Doug Zongker <dougz@android.com> am 17986e6b: am 8cd9e4f3: fix bug in applying patches

Merge commit '17986e6b8766ef9bdaa49efc7099e3867ca1978a' into gingerbread-plus-aosp

* commit '17986e6b8766ef9bdaa49efc7099e3867ca1978a':
fix bug in applying patches
17986e6b8766ef9bdaa49efc7099e3867ca1978a 13-Aug-2010 Doug Zongker <dougz@android.com> am 8cd9e4f3: fix bug in applying patches

Merge commit '8cd9e4f3d4eba481b411482331293c8079ab24b2' into gingerbread

* commit '8cd9e4f3d4eba481b411482331293c8079ab24b2':
fix bug in applying patches
8cd9e4f3d4eba481b411482331293c8079ab24b2 13-Aug-2010 Doug Zongker <dougz@android.com> 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
pplypatch/applypatch.c
04611da55b13f9697173d3aa947b3a735b96c01f 13-Aug-2010 Doug Zongker <dougz@android.com> support using an EMMC misc partition to store recovery arguments

Change-Id: I9f912857cfc6afb8ba764f5541af7f01df029a77
ootloader.c
oots.c
db314d69f023d2a6c8956073aa9d283e20b280ef 02-Aug-2010 Hristo Bojinov <hristo@google.com> Working ASLR implementation

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
ndroid.mk
pplypatch/Android.mk
pplypatch/applypatch.c
pplypatch/applypatch.h
pplypatch/main.c
inelf/Android.mk
inelf/Retouch.c
inelf/Retouch.h
pdater/Android.mk
pdater/install.c
f635d2e91006028afa8b0fc53f80e5c157c495e6 02-Aug-2010 Doug Zongker <dougz@android.com> don't go into file select menu when mounting external storage fails

Change-Id: If0efeddc28e1dbb52d9e52abf53323e2cc97c8f0
ecovery.c
dc9e87c44bac4504aed26061736cbc6e439bec51 30-Jul-2010 Doug Zongker <dougz@android.com> generalize "install from sdcard" to "install from external storage"

Allow sideloading of OTA packages from USB drives that appear as
/dev/block/sda1.

Change-Id: I1908576c24547cd0088475d8c8917699cd906868
efault_recovery_ui.c
ecovery.c
ecovery_ui.h
oots.c
b4277c25c639aa462a1d2f2d78f776443c670fb6 21-Jul-2010 Ying Wang <wangying@google.com> Mute unwanted error message

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
pdater/Android.mk
050d0f7fec309a51d1e616a98882faaf3655e04e 09-Jul-2010 Doug Zongker <dougz@android.com> resolved conflicts for merge of c02c37a1 to master

Change-Id: Iafb9cb4adf27a7086d587d95e94ab1bd050099dc
c02c37a1e6bd67198a6522461b81c9cdd125625e 09-Jul-2010 Doug Zongker <dougz@android.com> am 23ceeea8: make a copy of sideloaded packages in /tmp before verifying

Merge commit '23ceeea85e6a3555dd3d7140128e310954cadf7f' into gingerbread-plus-aosp

* commit '23ceeea85e6a3555dd3d7140128e310954cadf7f':
make a copy of sideloaded packages in /tmp before verifying
23ceeea85e6a3555dd3d7140128e310954cadf7f 09-Jul-2010 Doug Zongker <dougz@android.com> 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
ecovery.c
oots.c
f291d858f8c9bf40051d50adfd10e758aa222315 07-Jul-2010 Doug Zongker <dougz@android.com> 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: I3766b9e77c639769ddf693b675da51d57f6e6b1d
pplypatch/applypatch.c
i.c
3d177d055c9cf3571e4b7c098818b454d1dbf9d7 01-Jul-2010 Doug Zongker <dougz@android.com> 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.
ommon.h
nstall.c
ecovery.c
i.c
pdater/Android.mk
pdater/install.c
b442b45bdd7df72de4958fad40f8ac675203d5c1 01-Jul-2010 Doug Zongker <dougz@android.com> Merge "support userdata and cache partitions using emmc/ext4 instead of mtd/yaffs"
42cfc2cc059eb7828821f6fecff71cf7c2f78579 01-Jul-2010 The Android Open Source Project <initial-contribution@android.com> am 60faafcf: merge from open-source master

Merge commit '60faafcf01ff7f4179cdcaefd24b10ac4ee7f692'

* commit '60faafcf01ff7f4179cdcaefd24b10ac4ee7f692':
60faafcf01ff7f4179cdcaefd24b10ac4ee7f692 01-Jul-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I9d0122dbf1a9c2bd1898c41766c5bf4320f2313a
49c73a76a3297de8c8b767d46452d1c68f23b965 30-Jun-2010 Doug Zongker <dougz@android.com> support userdata and cache partitions using emmc/ext4 instead of mtd/yaffs

Change-Id: I827af624c9ec7c64decb702de8c0310cf19b4141
ndroid.mk
oots.c
ba634dc9f70af3024e8db566b7a223066ee4527e 28-Jun-2010 Kenny Root <kroot@google.com> am c78a9698: am ecc76ba5: Set adbd to be disabled by default in recovery

Merge commit 'c78a9698dd55a165c2206c380f87f173bacba2aa'

* commit 'c78a9698dd55a165c2206c380f87f173bacba2aa':
Set adbd to be disabled by default in recovery
4fef81a5a97c3eaa8806d18366007d51eb9ea54a 28-Jun-2010 Kenny Root <kroot@google.com> am ecc76ba5: Set adbd to be disabled by default in recovery

Merge commit 'ecc76ba5516d62a886f9c290906e0ca50702c9ab' into froyo-plus-aosp

* commit 'ecc76ba5516d62a886f9c290906e0ca50702c9ab':
Set adbd to be disabled by default in recovery
c78a9698dd55a165c2206c380f87f173bacba2aa 28-Jun-2010 Kenny Root <kroot@google.com> am ecc76ba5: 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
ecc76ba5516d62a886f9c290906e0ca50702c9ab 28-Jun-2010 Kenny Root <kroot@google.com> Set adbd to be disabled by default in recovery

Change-Id: I74fa6edc4b001247b20be52e8301d18407fede2c
tc/init.rc
9e6513f1450eb060862eb3bd7111176abee4ca6c 25-Jun-2010 Nick Kralevich <nnk@google.com> am 21b97ed5: Add __attribute__((format(printf, a, b))) to printf like functions.

Merge commit '21b97ed5693d039e8b9dea57a160d3307f412682'

* commit '21b97ed5693d039e8b9dea57a160d3307f412682':
Add __attribute__((format(printf, a, b))) to printf like functions.
21b97ed5693d039e8b9dea57a160d3307f412682 25-Jun-2010 Nick Kralevich <nnk@google.com> Add __attribute__((format(printf, a, b))) to printf like functions.

Fix potential string format bug.

Change-Id: Ie05aac53b2c45a48bd68e340b76ccb21edfd28b7
ommon.h
nstall.c
b3d9a15b66c5235c7c6cda3232b7b30da08c3780 14-May-2010 Colin Cross <ccross@android.com> am dd6a0412: recovery: Add ueventd service
dd6a0412b5d4623f63e46120c648342824029c18 14-May-2010 Colin Cross <ccross@android.com> recovery: Add ueventd service

Change-Id: Iad448bc1608f88c5db2108475f35b88ea2877b07
tc/init.rc
eb681fd491c53b458a6e5801c5869377e15d0bcb 04-May-2010 Bruce Beare <brucex.j.beare@intel.com> am be42930f: am 97ca48e7: generic_x86 support
be42930f0b8d66dfb05127fd3d524e596de65595 04-May-2010 Bruce Beare <brucex.j.beare@intel.com> am 97ca48e7: generic_x86 support

Merge commit '97ca48e7f4ac8d3842f74f92b8f40d0e74733f38' into kraken

* commit '97ca48e7f4ac8d3842f74f92b8f40d0e74733f38':
generic_x86 support
97ca48e7f4ac8d3842f74f92b8f40d0e74733f38 28-Apr-2010 Bruce Beare <brucex.j.beare@intel.com> 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
pplypatch/Android.mk
be598881d079511385a88b12b7a14b97e63dc85e 08-Apr-2010 Doug Zongker <dougz@android.com> 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: I85c94c0e9bc8e05ca52031fc29ca2624c2695ced
ommon.h
efault_recovery_ui.c
ecovery.c
i.c
6102227b0ba7fccfd44c4d2038d1eb6e946147b5 02-Apr-2010 Oscar Montemayor <oam@google.com> am 52219a68: (-s ours) DO NOT MERGE Encrypted File Systems integration. Recovery changes.
52219a68a83c47f8c5b93038f57f3f130e7d0823 26-Feb-2010 Oscar Montemayor <oam@google.com> DO NOT MERGE
Encrypted File Systems integration. Recovery changes.

Change-Id: I932f73a6f937aac061128e1134eab08c30f0471d
ndroid.mk
fs_migration.c
fs_migration.h
ncryptedfs_provisioning.c
ncryptedfs_provisioning.h
ecovery.c
f33e24645b1531ed2abfe01d4e9cfb41637d2ee1 31-Mar-2010 Oscar Montemayor <oam@google.com> Merge "Encrypted File Systems part 3. Recovery changes."
be17b1c0d74201cf6d956a19ab5b684d4e9b807a 30-Mar-2010 Oscar Montemayor <oam@google.com> am 51282faa: (-s ours) am 2654f5aa: (-s ours) DO NOT MERGE Removing unused recovey options. Please refer to Bug#2502219 for more info.
51282faa8c429f63c03b4007d66371863e6e8c2d 30-Mar-2010 Oscar Montemayor <oam@google.com> am 2654f5aa: (-s ours) DO NOT MERGE Removing unused recovey options. Please refer to Bug#2502219 for more info.

Merge commit '2654f5aae18c67ad9aff6dbcdf9bc67b62e37d2d' into kraken

* commit '2654f5aae18c67ad9aff6dbcdf9bc67b62e37d2d':
DO NOT MERGE
2654f5aae18c67ad9aff6dbcdf9bc67b62e37d2d 27-Mar-2010 Oscar Montemayor <oam@google.com> DO NOT MERGE
Removing unused recovey options.
Please refer to Bug#2502219 for more info.

Change-Id: I2fe3cdb0c8b93ed7e1cc4093824fbe181f5f0aea
ndroid.mk
fs_migration.c
fs_migration.h
ecovery.c
31f6ee88ce0d5155cb62d1b928604568318981a3 26-Feb-2010 Oscar Montemayor <oam@google.com> Encrypted File Systems part 3. Recovery changes.

Change-Id: I932f73a6f937aac061128e1134eab08c30f0471d
ndroid.mk
fs_migration.c
fs_migration.h
ncryptedfs_provisioning.c
ncryptedfs_provisioning.h
ecovery.c
dcc38b3c153dc859fc71a836ff70b52ef311fc22 09-Mar-2010 Jean-Baptiste Queru <jbq@google.com> Add an empty CleanSpec.mk

Change-Id: Icd177bd26120e0c8929faa8d1007f6c5bd446cb8
leanSpec.mk
5b695f393e6777aad4618d55f2b507e57bb4dc4b 25-Feb-2010 Doug Zongker <dougz@android.com> make StringValue wrapper okay to call on NULL

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
dify/expr.c
c4351c791052ad529a4e83c600b1aa6e6420ea86 22-Feb-2010 Doug Zongker <dougz@android.com> refactor applypatch and friends

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
pplypatch/Android.mk
pplypatch/applypatch.c
pplypatch/applypatch.h
pplypatch/applypatch.sh
pplypatch/bspatch.c
pplypatch/imgpatch.c
pplypatch/main.c
pplypatch/utils.c
pplypatch/utils.h
dify/main.c
dify/yydefs.h
pdater/install.c
583fc12c3dbe09e3a9b759b9466c505b006e6a39 20-Feb-2010 Doug Zongker <dougz@android.com> add missing includes to fix mac build (maybe)

Change-Id: Id2712940c4929f3a8b3ba5d4e9e03bb8034747ee
dify/expr.h
dify/lexer.l
512536a54a1a211a9f582e76cbf12850dc7d5466 18-Feb-2010 Doug Zongker <dougz@android.com> relocate applypatch; add type system and new functions to edify

- 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
ndroid.mk
pplypatch/Android.mk
pplypatch/applypatch.c
pplypatch/applypatch.h
pplypatch/applypatch.sh
pplypatch/bsdiff.c
pplypatch/bspatch.c
pplypatch/freecache.c
pplypatch/imgdiff.c
pplypatch/imgdiff.h
pplypatch/imgdiff_test.sh
pplypatch/imgpatch.c
pplypatch/main.c
pplypatch/testdata/new.file
pplypatch/testdata/old.file
pplypatch/testdata/patch.bsdiff
pplypatch/utils.c
pplypatch/utils.h
dify/expr.c
dify/expr.h
pdater/install.c
pdater/updater.c
21854ccdb250e6e81311b4317934e8c953b252a8 18-Feb-2010 Kenny Root <kroot@google.com> Filename check and free allocated strings

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
dify/expr.c
dify/main.c
2e068dc33053970c2d58984ee182058bdac950db 05-Feb-2010 The Android Open Source Project <initial-contribution@android.com> am da846fcf: am 4c382b13: reconcile main tree with open-source eclair

Merge commit 'da846fcf1b6a7bbd2f9f30c965b25f084568ef75'

* commit 'da846fcf1b6a7bbd2f9f30c965b25f084568ef75':
android-2.1_r1 snapshot
da846fcf1b6a7bbd2f9f30c965b25f084568ef75 05-Feb-2010 The Android Open Source Project <initial-contribution@android.com> am 4c382b13: reconcile main tree with open-source eclair

Merge commit '4c382b13657be5d949e7dfc9ef46a66f2eb496e0' into eclair-plus-aosp

* commit '4c382b13657be5d949e7dfc9ef46a66f2eb496e0':
android-2.1_r1 snapshot
4c382b13657be5d949e7dfc9ef46a66f2eb496e0 05-Feb-2010 The Android Open Source Project <initial-contribution@android.com> reconcile main tree with open-source eclair
e08991e02a7d678f2574e85289a34b2a9a537c82 02-Feb-2010 Doug Zongker <dougz@android.com> bump updater API version to 3; deprecate firmware update command

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
ndroid.mk
ootloader.c
ootloader.h
ommon.h
irmware.c
irmware.h
nstall.c
ecovery.c
es/images/icon_firmware_error.png
es/images/icon_firmware_install.png
i.c
pdater/install.c
pdater/updater.c
pdater/updater.h
93dbe07ff6c06e8df2c804cbac63601fbb1de041 02-Feb-2010 Doug Zongker <dougz@android.com> Merge "change log recovery to generic device_recovery_start function"
efa1bab94c332892abe7306cc963edaed709f651 02-Feb-2010 Doug Zongker <dougz@android.com> change log recovery to generic device_recovery_start function

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
efault_recovery_ui.c
irmware.c
ecovery.c
ecovery_ui.h
6aece33b3f3af6a161e326af36bc894427fcf5ad 01-Feb-2010 Doug Zongker <dougz@android.com> add a one-argument version of package_extract_file

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
inzip/Zip.c
inzip/Zip.h
pdater/install.c
b551724ceb206c6140f1e28367c9a95de739e022 29-Jan-2010 The Android Open Source Project <initial-contribution@android.com> reconcile android-2.1_r1 snapshot
aa062531aa3e740b6cf7d3690fd5310e7fdf03f2 29-Jan-2010 Doug Zongker <dougz@android.com> fix parsing of dumpkeys output

%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
nstall.c
687bc12ccfbda26ad134b27d09d1d70a2b8705a6 21-Jan-2010 Doug Zongker <dougz@android.com> save the recovery log from before HTC firmware updates

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
ootloader.c
ootloader.h
irmware.c
irmware.h
ecovery.c
883b4c8be5f50cde679cdfa589d7ade83c0253b7 13-Jan-2010 Doug Zongker <dougz@android.com> am 4e9332cb: am 22d79a5c: make offsets in firmware update header not point to bad blocks

Merge commit '4e9332cb0bb84df4c08bbb469e59a54eab2a9df0'

* commit '4e9332cb0bb84df4c08bbb469e59a54eab2a9df0':
make offsets in firmware update header not point to bad blocks
4e9332cb0bb84df4c08bbb469e59a54eab2a9df0 13-Jan-2010 Doug Zongker <dougz@android.com> am 22d79a5c: 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
22d79a5c5eab9c1e86ff2af210bb072689e2d630 13-Jan-2010 Doug Zongker <dougz@android.com> 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?)
ootloader.c
tdutils/mtdutils.c
tdutils/mtdutils.h
4c5f9f341665ac4c1474afca92863cc02d9e1a13 13-Jan-2010 Doug Zongker <dougz@android.com> make offsets in firmware update header not point to 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?)
ootloader.c
tdutils/mtdutils.c
tdutils/mtdutils.h
b765729081399b6826c9d45d77c9c58ca2f32816 13-Jan-2010 The Android Open Source Project <initial-contribution@android.com> android-2.1_r1 snapshot
tdutils/mtdutils.c
erifier.c
be47155f754d6070c93614eed8549a30742bd091 22-Dec-2009 Jean-Baptiste Queru <jbq@google.com> am 158657bc: merge from open-source master

Merge commit '158657bc5ce438d3cf1f601255896b854fd49103'

* commit '158657bc5ce438d3cf1f601255896b854fd49103':
Security: Fix typo in recovery EOCD detection.
158657bc5ce438d3cf1f601255896b854fd49103 22-Dec-2009 Jean-Baptiste Queru <jbq@google.com> merge from open-source master
9b514530a617b650315d0c44b31720f9f0b1a875 16-Dec-2009 Doug Zongker <dougz@android.com> am d36308c2: am 17a47098: use MEMGETBADBLOCK to look for bad blocks when reading MTD partitions

Merge commit 'd36308c26d3f2947f4ff49f2ecc22cbb659fdf37'

* commit 'd36308c26d3f2947f4ff49f2ecc22cbb659fdf37':
use MEMGETBADBLOCK to look for bad blocks when reading MTD partitions
d36308c26d3f2947f4ff49f2ecc22cbb659fdf37 15-Dec-2009 Doug Zongker <dougz@android.com> am 17a47098: 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
8fae8279fa9b69b6d7e5033f5398d76d0e4c0c53 15-Dec-2009 Android Git Automerger <android-git-automerger@android.com> Merge commit 'goog/eclair-plus-aosp'
17a47098d2a4214397f8b30e2692c9487d7ab5ff 15-Dec-2009 Doug Zongker <dougz@android.com> use MEMGETBADBLOCK to look for bad blocks when reading MTD partitions
tdutils/mtdutils.c
25215285c4afb686eab90fa48f0965dcdea3564c 11-Dec-2009 Doug Zongker <dougz@android.com> am 9b430e11: am 73ae31ce: add a simple unit test for the OTA package verifier

Merge commit '9b430e11d6c4fb907d0aa96667142e2c00585e09'

* commit '9b430e11d6c4fb907d0aa96667142e2c00585e09':
add a simple unit test for the OTA package verifier
9b430e11d6c4fb907d0aa96667142e2c00585e09 11-Dec-2009 Doug Zongker <dougz@android.com> am 73ae31ce: 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
bd6181ad58c6c3562be58ef41d61460384e6fd8e 10-Dec-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I117fdea9

* 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.
0523156775ca9a8242953f856e3daa7c1b82b0e5 30-Nov-2009 Oscar Montemayor <oam@google.com> 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.
ndroid.mk
fs_migration.c
fs_migration.h
ecovery.c
002c9dfb8082b9971c987c9630b3de77f5ae4bf9 10-Dec-2009 Doug Zongker <dougz@android.com> am 2278a04a: am 9acf28a3: am c652e41d: fix cut-and-paste error in verifier

Merge commit '2278a04a0921007d726e9e1ec4b668860f961f88'

* commit '2278a04a0921007d726e9e1ec4b668860f961f88':
fix cut-and-paste error in verifier
73ae31ce0ac09c0e45924d817644261c87ab1a60 10-Dec-2009 Doug Zongker <dougz@android.com> add a simple unit test for the OTA package verifier
ndroid.mk
estdata/alter-footer.zip
estdata/alter-metadata.zip
estdata/fake-eocd.zip
estdata/jarsigned.zip
estdata/otasigned.zip
estdata/random.zip
estdata/unsigned.zip
erifier.c
erifier_test.c
erifier_test.sh
2278a04a0921007d726e9e1ec4b668860f961f88 10-Dec-2009 Doug Zongker <dougz@android.com> am 9acf28a3: am c652e41d: fix cut-and-paste error in verifier

Merge commit '9acf28a390aab3e0f394c701bc3cda6cbc9393b3' into eclair-mr2-plus-aosp

* commit '9acf28a390aab3e0f394c701bc3cda6cbc9393b3':
fix cut-and-paste error in verifier
3b0f4847762a208e6cd166d420e15b0bf013e612 09-Dec-2009 Steve Kondik <shade@chemlab.org> Security: Fix typo in recovery EOCD detection.

This issue results in the ability to modify the contents of a signed
OTA recovery image.
erifier.c
9acf28a390aab3e0f394c701bc3cda6cbc9393b3 09-Dec-2009 Doug Zongker <dougz@android.com> am c652e41d: fix cut-and-paste error in verifier

Merge commit 'c652e41d9173e299a8e1805ae1b2bba75a34ae12' into eclair-mr2

* commit 'c652e41d9173e299a8e1805ae1b2bba75a34ae12':
fix cut-and-paste error in verifier
614907365128497c74c1f61d7576bff12e108f70 09-Dec-2009 Doug Zongker <dougz@android.com> am c652e41d: fix cut-and-paste error in verifier

Merge commit 'c652e41d9173e299a8e1805ae1b2bba75a34ae12' into eclair-plus-aosp

* commit 'c652e41d9173e299a8e1805ae1b2bba75a34ae12':
fix cut-and-paste error in verifier
c652e41d9173e299a8e1805ae1b2bba75a34ae12 09-Dec-2009 Doug Zongker <dougz@android.com> fix cut-and-paste error in verifier

Oops.
erifier.c
b8f506fb37ee9e20075cf544a8b5c167d3a2de22 16-Nov-2009 Jean-Baptiste Queru <jbq@google.com> am 6e5be9b2: merge from open-source master

Merge commit '6e5be9b24c232be4cfc22b7cbabb0fdf6d869f7c'

* commit '6e5be9b24c232be4cfc22b7cbabb0fdf6d869f7c':
eclair snapshot
6e5be9b24c232be4cfc22b7cbabb0fdf6d869f7c 15-Nov-2009 Jean-Baptiste Queru <jbq@google.com> merge from open-source master
052acd61c8748b728d632464f52a47a0841f6bac 15-Nov-2009 Jean-Baptiste Queru <jbq@google.com> merge from open-source master

Merge commit 'goog/stage-korg-master' into HEAD
b2ce982d432338d36a41bd57e35a14459fc3d30b 15-Nov-2009 Jean-Baptiste Queru <jbq@google.com> merge from eclair
a43c44f31f873d7e39d3c2872f0b9531b1584f11 13-Nov-2009 Jean-Baptiste Queru <jbq@google.com> eclair snapshot
ndroid.mk
ommon.h
efault_recovery_ui.c
nstall.c
inui/graphics.c
inui/minui.h
ecovery.c
ecovery_ui.h
es/images/icon_error.png
es/images/icon_firmware_install.png
es/images/icon_installing.png
oots.c
i.c
pdater/Android.mk
pdater/install.c
pdater/updater.c
erifier.c
erifier.h
f88cea6ded2023bd7b3330640f28cc730599e934 15-Oct-2009 Jean-Baptiste Queru <jbq@google.com> am 4011770f: merge from open-source master

Merge commit '4011770f2d06fcb743abc91a01a531c7ae2d9175'

* commit '4011770f2d06fcb743abc91a01a531c7ae2d9175':
4011770f2d06fcb743abc91a01a531c7ae2d9175 15-Oct-2009 Jean-Baptiste Queru <jbq@google.com> merge from open-source master
31f0fc22357707b7c71f2ca08878b6ce6ddde1cb 13-Oct-2009 Doug Zongker <dougz@android.com> am d93a2545: simplify construction of the recovery progress bar

Merge commit 'd93a25459cdefba940f254b4c5f54fd7d9cdaf11'

* commit 'd93a25459cdefba940f254b4c5f54fd7d9cdaf11':
simplify construction of the recovery progress bar
2ec8a1929fea6fb2c0b1b0985dddb16d19d5e911 12-Oct-2009 Doug Zongker <dougz@android.com> am 54ec81fe: Merge change I1c8ca2e4 into eclair

Merge commit '54ec81fe86225d5f3ee3ab16e3266ae88cd639fa'

* commit '54ec81fe86225d5f3ee3ab16e3266ae88cd639fa':
replace generic recovery icons
022229c47e5bd918d26d11b3c12ae0dc0af58605 12-Oct-2009 Doug Zongker <dougz@android.com> am 988500b6: add terminator to recovery\'s getopt_long options array

Merge commit '988500b615de24455e1fee69e72055bb1dca9c86'

* commit '988500b615de24455e1fee69e72055bb1dca9c86':
add terminator to recovery's getopt_long options array
d93a25459cdefba940f254b4c5f54fd7d9cdaf11 09-Oct-2009 Doug Zongker <dougz@android.com> 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.
inui/resources.c
es/images/indeterminate1.png
es/images/indeterminate2.png
es/images/indeterminate3.png
es/images/indeterminate4.png
es/images/indeterminate5.png
es/images/indeterminate6.png
es/images/progress_bar_empty.png
es/images/progress_bar_empty_left_round.png
es/images/progress_bar_empty_right_round.png
es/images/progress_bar_fill.png
es/images/progress_bar_left_round.png
es/images/progress_bar_right_round.png
es/images/progress_empty.png
es/images/progress_fill.png
i.c
d641a0e1413f4db37016d4fc1d1418320d9464f2 08-Oct-2009 Doug Zongker <dougz@android.com> am 54ec81fe: Merge change I1c8ca2e4 into eclair

Merge commit '54ec81fe86225d5f3ee3ab16e3266ae88cd639fa' into eclair-plus-aosp

* commit '54ec81fe86225d5f3ee3ab16e3266ae88cd639fa':
replace generic recovery icons
54ec81fe86225d5f3ee3ab16e3266ae88cd639fa 08-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I1c8ca2e4 into eclair

* changes:
replace generic recovery icons
42ab176195efbe16998e3162e9f6e987b13dfee4 07-Oct-2009 Doug Zongker <dougz@android.com> am 988500b6: add terminator to recovery\'s getopt_long options array

Merge commit '988500b615de24455e1fee69e72055bb1dca9c86' into eclair-plus-aosp

* commit '988500b615de24455e1fee69e72055bb1dca9c86':
add terminator to recovery's getopt_long options array
988500b615de24455e1fee69e72055bb1dca9c86 06-Oct-2009 Doug Zongker <dougz@android.com> add terminator to recovery's getopt_long options array

http://b/2170691 - recovery argument parsing is broken
ecovery.c
1c8ca2e40b3c4b1a847332f90de7fef4046cb225 03-Oct-2009 Doug Zongker <dougz@android.com> replace generic recovery icons
es/images/icon_error.png
es/images/icon_firmware_install.png
es/images/icon_installing.png
4526d4fe6252d0c328c4e9ce8e1920f6d6ad1bbc 25-Sep-2009 Doug Zongker <dougz@android.com> am 8f8bc4cb: am f93d8166: confirm before wiping user data in recovery

Merge commit '8f8bc4cb487e0f853c97cb5ff1481d707ac6b66d'

* commit '8f8bc4cb487e0f853c97cb5ff1481d707ac6b66d':
confirm before wiping user data in recovery
8f8bc4cb487e0f853c97cb5ff1481d707ac6b66d 23-Sep-2009 Doug Zongker <dougz@android.com> am f93d8166: confirm before wiping user data in recovery

Merge commit 'f93d8166ef4c06f6ad71293ffa8a4ce469df4fa5' into eclair-plus-aosp

* commit 'f93d8166ef4c06f6ad71293ffa8a4ce469df4fa5':
confirm before wiping user data in recovery
f93d8166ef4c06f6ad71293ffa8a4ce469df4fa5 23-Sep-2009 Doug Zongker <dougz@android.com> 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.)
ecovery.c
83a25d7380d0d27c8b7eae02b0d0e339c88d71ce 20-Sep-2009 Doug Zongker <dougz@android.com> am 486aa290: am fd8fb0c4: reduce fraction of progress bar for verification

Merge commit '486aa290635dbf6f60b3435694951fed3470ffdf'

* commit '486aa290635dbf6f60b3435694951fed3470ffdf':
reduce fraction of progress bar for verification
486aa290635dbf6f60b3435694951fed3470ffdf 20-Sep-2009 Doug Zongker <dougz@android.com> am fd8fb0c4: reduce fraction of progress bar for verification

Merge commit 'fd8fb0c49242af5147708f1a93ea3acba546555b' into eclair-plus-aosp

* commit 'fd8fb0c49242af5147708f1a93ea3acba546555b':
reduce fraction of progress bar for verification
fd8fb0c49242af5147708f1a93ea3acba546555b 20-Sep-2009 Doug Zongker <dougz@android.com> 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.
ommon.h
66c76bcfcfcf012a8af0477b58465940f76add2d 19-Sep-2009 Doug Zongker <dougz@android.com> am d16fb221: am 60babf8b: delete files before symlinking; log error messages

Merge commit 'd16fb221cd27abea8a954bd5f6554fa116366519'

* commit 'd16fb221cd27abea8a954bd5f6554fa116366519':
delete files before symlinking; log error messages
d16fb221cd27abea8a954bd5f6554fa116366519 19-Sep-2009 Doug Zongker <dougz@android.com> am 60babf8b: delete files before symlinking; log error messages

Merge commit '60babf8ba766662cc0932e8271b67daa69cddd5f' into eclair-plus-aosp

* commit '60babf8ba766662cc0932e8271b67daa69cddd5f':
delete files before symlinking; log error messages
60babf8ba766662cc0932e8271b67daa69cddd5f 19-Sep-2009 Doug Zongker <dougz@android.com> 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).
pdater/install.c
b9ad6dfd81fdc2a25b3e3b9647912e74ca0cf47c 17-Sep-2009 Doug Zongker <dougz@android.com> am 2f4fc561: am 196c25c7: don\'t complain if recovery icon is short

Merge commit '2f4fc56183f3fe2edb5e3cd5e12329871e02518f'

* commit '2f4fc56183f3fe2edb5e3cd5e12329871e02518f':
don't complain if recovery icon is short
2f4fc56183f3fe2edb5e3cd5e12329871e02518f 15-Sep-2009 Doug Zongker <dougz@android.com> am 196c25c7: 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
196c25c777daedbe2fe5a45171fb42e43ceed9af 15-Sep-2009 Doug Zongker <dougz@android.com> 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).
i.c
49c82ce55385b60a61236e79fc5c4185871a1d03 10-Sep-2009 Doug Zongker <dougz@android.com> am b5d542cd: am a3f89eab: add a run_program() function to edify

Merge commit 'b5d542cd40360867bc00cdb9266c0abf26448c55'

* commit 'b5d542cd40360867bc00cdb9266c0abf26448c55':
add a run_program() function to edify
b5d542cd40360867bc00cdb9266c0abf26448c55 10-Sep-2009 Doug Zongker <dougz@android.com> am a3f89eab: add a run_program() function to edify

Merge commit 'a3f89eabb7ddcf44add8ce3b321ceab6d35289cb' into eclair-plus-aosp

* commit 'a3f89eabb7ddcf44add8ce3b321ceab6d35289cb':
add a run_program() function to edify
a3f89eabb7ddcf44add8ce3b321ceab6d35289cb 10-Sep-2009 Doug Zongker <dougz@android.com> add a run_program() function to edify

Handy for producing debugging OTA packages (eg, running sqlite3 or
whatever in recovery).
pdater/install.c
af42fa0a7dea9702297640a3ecd4ad5e5e74d259 04-Sep-2009 Jean-Baptiste Queru <jbq@google.com> am 9a77b613: merge from open-source master

Merge commit '9a77b613f3fdf6340b0f5f24d1c725fd0001e4a9'

* commit '9a77b613f3fdf6340b0f5f24d1c725fd0001e4a9':
9a77b613f3fdf6340b0f5f24d1c725fd0001e4a9 04-Sep-2009 Jean-Baptiste Queru <jbq@google.com> merge from open-source master
65a56909a336c99ad96eac30f4dc697f36598377 03-Sep-2009 Jean-Baptiste Queru <jbq@google.com> merge from donut
2f39bf9a9f83b3fd165fa3b443a16b2fe86cd124 01-Sep-2009 Jean-Baptiste Queru <jbq@google.com> am cbf90380: merge from open-source master

Merge commit 'cbf903803850deb4f70490d97a1603e7b8679cc2'

* commit 'cbf903803850deb4f70490d97a1603e7b8679cc2':
Not all failures to fopen_root_path() are serious.
cbf903803850deb4f70490d97a1603e7b8679cc2 01-Sep-2009 Jean-Baptiste Queru <jbq@google.com> merge from open-source master
619ec2f3aadb814cd09e412e832d94d5c4665ea6 17-Nov-2008 Jay Freeman (saurik) <saurik@saurik.com> Not all failures to fopen_root_path() are serious.
Example: E:Can't open /cache/recovery/command.
ecovery.c
6785c2534ab29a5a4c7e6ac83f53e4e008758ceb 18-Aug-2009 Doug Zongker <dougz@android.com> am 34c98df7: (-s ours) do not merge: cherry-pick of c2d666bd4f6eb5f7a9f17b10435c161cb105b7c5 from master

Merge commit '34c98df78a80881698f63ce0815f3e16823d85e0'

* commit '34c98df78a80881698f63ce0815f3e16823d85e0':
do not merge: cherry-pick of c2d666bd4f6eb5f7a9f17b10435c161cb105b7c5 from master
34c98df78a80881698f63ce0815f3e16823d85e0 18-Aug-2009 Doug Zongker <dougz@android.com> do not merge: cherry-pick of c2d666bd4f6eb5f7a9f17b10435c161cb105b7c5 from master
ecovery.c
c2d666bd4f6eb5f7a9f17b10435c161cb105b7c5 04-Aug-2009 Jared Suttles <jared.suttles@motorola.com> Recovery: When updating from SD card, update can't resume automatically
after a power loss

Submitted on behalf of Hong-Bin Wang <hong-binwang@motorola.com>
Signed-off-by: Jared Suttles <jared.suttles@motorola.com>
ecovery.c
50a8a71f0b84ca279d780fd227970b551f079fb6 17-Aug-2009 Doug Zongker <dougz@android.com> am 54e2e86c: (-s ours) do not merge: cherry-picked 60151a295ccf726238dc47456d80b427db6d6a38 from master branch

Merge commit '54e2e86c5740a2c7a02e95e94c4aff362a5502cf'

* commit '54e2e86c5740a2c7a02e95e94c4aff362a5502cf':
do not merge: cherry-picked 60151a295ccf726238dc47456d80b427db6d6a38 from master branch
54e2e86c5740a2c7a02e95e94c4aff362a5502cf 17-Aug-2009 Doug Zongker <dougz@android.com> do not merge: cherry-picked 60151a295ccf726238dc47456d80b427db6d6a38 from master branch
nstall.c
erifier.c
erifier.h
60151a295ccf726238dc47456d80b427db6d6a38 13-Aug-2009 Doug Zongker <dougz@android.com> verify whole-file signature instead of jarsigner signatures

In recovery, verify a signature that covers the entire zip file,
instead of using the jarsigner format to verify individual files.

Bug: 1328985
nstall.c
erifier.c
erifier.h
0cf0e33b5fdb6eb871b64f5325ccd54339f62f01 04-Aug-2009 Jean-Baptiste Queru <jbq@google.com> merge from open-source master
b9955b837321e36f65eb9ec0d2ec7c2681774143 04-Aug-2009 Doug Zongker <dougz@android.com> am 20697b96: only build flash_image for eng

Merge commit '20697b965cd923211daeea2037f60218358b9659'

* commit '20697b965cd923211daeea2037f60218358b9659':
only build flash_image for eng
34109de24e124dff020b26552d46b20299d779fd 29-Jul-2009 Jean-Baptiste Queru <jbq@google.com> merge from donut
eb1ac27bf07731a2ffde15a26791abbabfcb2a00 26-Jul-2009 Jean-Baptiste Queru <jbq@google.com> reconcile korg/master into goog/master
7bd5c660752ddd1b4ff6127b316fd6d8fb1005c7 26-Jul-2009 Jean-Baptiste Queru <jbq@google.com> Merge korg/donut into korg/master
20697b965cd923211daeea2037f60218358b9659 24-Jul-2009 Doug Zongker <dougz@android.com> 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.
tdutils/Android.mk
23412e6f143c099e6c2470ad6bf98a2783eb0452 23-Jul-2009 Doug Zongker <dougz@android.com> fix compile warnings in recovery, change images

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.
efault_recovery_ui.c
ecovery_ui.h
es/images/icon_error.png
es/images/icon_firmware_install.png
es/images/icon_installing.png
i.c
608fa02e1ac0ea11a0d3ca754f38bd76b77faa82 16-Jul-2009 Doug Zongker <dougz@android.com> resolved conflicts for merge of 64893ccc to master
64893ccc09b25ac31bc6a17f5c7f43c7fa789576 15-Jul-2009 Doug Zongker <dougz@android.com> remove amend

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.
ndroid.mk
mend/Android.mk
mend/amend.c
mend/amend.h
mend/ast.c
mend/ast.h
mend/commands.c
mend/commands.h
mend/execute.c
mend/execute.h
mend/lexer.h
mend/lexer.l
mend/main.c
mend/parser.h
mend/parser_y.y
mend/register.c
mend/register.h
mend/symtab.c
mend/symtab.h
mend/test_commands.c
mend/test_symtab.c
mend/tests/001-nop/expected.txt
mend/tests/001-nop/info.txt
mend/tests/001-nop/run
mend/tests/002-lex-empty/SKIP
mend/tests/002-lex-empty/expected.txt
mend/tests/002-lex-empty/info.txt
mend/tests/002-lex-empty/input
mend/tests/002-lex-empty/run
mend/tests/003-lex-command/expected.txt
mend/tests/003-lex-command/info.txt
mend/tests/003-lex-command/input
mend/tests/003-lex-command/input2
mend/tests/003-lex-command/input3
mend/tests/003-lex-command/input4
mend/tests/003-lex-command/run
mend/tests/004-lex-comment/expected.txt
mend/tests/004-lex-comment/info.txt
mend/tests/004-lex-comment/input
mend/tests/004-lex-comment/run
mend/tests/005-lex-quoted-string/expected.txt
mend/tests/005-lex-quoted-string/info.txt
mend/tests/005-lex-quoted-string/input
mend/tests/005-lex-quoted-string/input2
mend/tests/005-lex-quoted-string/input3
mend/tests/005-lex-quoted-string/run
mend/tests/006-lex-words/SKIP
mend/tests/006-lex-words/expected.txt
mend/tests/006-lex-words/info.txt
mend/tests/006-lex-words/input
mend/tests/006-lex-words/input2
mend/tests/006-lex-words/input3
mend/tests/006-lex-words/run
mend/tests/007-lex-real-script/expected.txt
mend/tests/007-lex-real-script/info.txt
mend/tests/007-lex-real-script/input
mend/tests/007-lex-real-script/run
mend/tests/008-parse-real-script/expected.txt
mend/tests/008-parse-real-script/info.txt
mend/tests/008-parse-real-script/input
mend/tests/008-parse-real-script/run
mend/tests/XXX-long-token/SKIP
mend/tests/XXX-stack-overflow/SKIP
mend/tests/one-test
mend/tests/run-all-tests
ommands.c
ommands.h
nstall.c
ecovery.c
ools/ota/Android.mk
ools/ota/make-update-script.c
c457ff643627fb3edf0321a37fcffd6b520f931e 03-Jul-2009 Doug Zongker <dougz@android.com> am bec02d57: skip over all-zero blocks when reading MTD partition

Merge commit 'bec02d57fb85cc7dd0196a54b0e9530e306623ac'

* commit 'bec02d57fb85cc7dd0196a54b0e9530e306623ac':
skip over all-zero blocks when reading MTD partition
bec02d57fb85cc7dd0196a54b0e9530e306623ac 01-Jul-2009 Doug Zongker <dougz@android.com> 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.
tdutils/mtdutils.c
fc382dfc751725253f956ddaf5b7b90be90b41d7 30-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am d8f7c9b8: Merge change 5545 into donut

Merge commit 'd8f7c9b85e25fab93fef2221a84b60edc2e7b837'

* commit 'd8f7c9b85e25fab93fef2221a84b60edc2e7b837':
remove updater from the user system image
d8f7c9b85e25fab93fef2221a84b60edc2e7b837 26-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 5545 into donut

* changes:
remove updater from the user system image
ad3db099d5ee17b1b46fee3131b9561b73b36703 26-Jun-2009 Doug Zongker <dougz@android.com> 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.
pdater/Android.mk
898ef399d3ee998a871bebd04264b29e23c66738 25-Jun-2009 Doug Zongker <dougz@android.com> am 0bbfe3d9: fix off-by-one error in set_perm()

Merge commit '0bbfe3d901885c1f0ab006e8d4cc1029c44a7376'

* commit '0bbfe3d901885c1f0ab006e8d4cc1029c44a7376':
fix off-by-one error in set_perm()
0bbfe3d901885c1f0ab006e8d4cc1029c44a7376 25-Jun-2009 Doug Zongker <dougz@android.com> fix off-by-one error in set_perm()

We were inadvertently skipping over the first filename in the list of
arguments.
pdater/install.c
4275c3cfc828ac2df143d353a4e27e8dda20b4a9 25-Jun-2009 Doug Zongker <dougz@android.com> am fbf3c10e: improve updater progress bar

Merge commit 'fbf3c10e45c20f8fe6bd1ac49ffe220035b9c454'

* commit 'fbf3c10e45c20f8fe6bd1ac49ffe220035b9c454':
improve updater progress bar
fbf3c10e45c20f8fe6bd1ac49ffe220035b9c454 24-Jun-2009 Doug Zongker <dougz@android.com> 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.
nstall.c
pdater/install.c
2b0fdc657115a4fe02af279fdbdab99c68df0a1a 19-Jun-2009 Doug Zongker <dougz@android.com> add device extension mechanism to updater

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.
pdater/Android.mk
pdater/updater.c
b128f54d0daa749d301b99a6637f42aa35822a76 19-Jun-2009 Doug Zongker <dougz@android.com> add function for device-specific wipe data features

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.
efault_recovery_ui.c
ecovery.c
ecovery_ui.h
oots.c
f8aaf0a77f72cc5614d9b9135c0d00f8a8160f20 18-Jun-2009 Doug Zongker <dougz@android.com> am 47cace98: add file_getprop() to updater

Merge commit '47cace98369f60df2351a65801c8065bb7f9dbf0'

* commit '47cace98369f60df2351a65801c8065bb7f9dbf0':
add file_getprop() to updater
47cace98369f60df2351a65801c8065bb7f9dbf0 18-Jun-2009 Doug Zongker <dougz@android.com> 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.
dify/expr.c
dify/expr.h
pdater/install.c
d683785ec9d36a9f4c7de1983f69a1f049132365 18-Jun-2009 Doug Zongker <dougz@android.com> resolved conflicts for merge of fb2e3af3 to master
fb2e3af3f915c0e3f2b4b027ef26777267ad46dc 18-Jun-2009 Doug Zongker <dougz@android.com> let the "firmware" command take the file straight from the package

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.
ndroid.mk
ommon.h
nstall.c
ecovery.c
pdater/updater.c
e77e091522122bed0b4f75a3abcb120e398c9abe 15-Jun-2009 Doug Zongker <dougz@android.com> am e3da02e7: add less_than_int, greater_than_int to edify

Merge commit 'e3da02e7bcfd85c543419e7590a3c86f64d8cc8a'

* commit 'e3da02e7bcfd85c543419e7590a3c86f64d8cc8a':
add less_than_int, greater_than_int to edify
84cbfb6cb4a82824a662137282c689f40057b28b 15-Jun-2009 Doug Zongker <dougz@android.com> am d9c9d10d: fixes to edify and updater script

Merge commit 'd9c9d10d9da76f067d3955bea71f7bb39e859fa5'

* commit 'd9c9d10d9da76f067d3955bea71f7bb39e859fa5':
fixes to edify and updater script
cf2b2a2e8fc0361b9db5826c2e5c92d9cb5920d3 15-Jun-2009 Doug Zongker <dougz@android.com> am 8edb00c9: edify extensions for OTA package installation, part 2

Merge commit '8edb00c990e563e6f91b278a212f2edf877cf763'

* commit '8edb00c990e563e6f91b278a212f2edf877cf763':
edify extensions for OTA package installation, part 2
e3da02e7bcfd85c543419e7590a3c86f64d8cc8a 13-Jun-2009 Doug Zongker <dougz@android.com> 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.
dify/expr.c
dify/main.c
d9c9d10d9da76f067d3955bea71f7bb39e859fa5 12-Jun-2009 Doug Zongker <dougz@android.com> 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".
dify/expr.c
dify/expr.h
dify/lexer.l
dify/main.c
dify/parser.y
dify/yydefs.h
nstall.c
pdater/install.c
pdater/updater.c
8edb00c990e563e6f91b278a212f2edf877cf763 12-Jun-2009 Doug Zongker <dougz@android.com> 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.
dify/expr.c
dify/main.c
dify/parser.y
nstall.c
pdater/Android.mk
pdater/install.c
pdater/updater.c
32eb0a8c8707789a2460fccfd052bfec6dfc2456 12-Jun-2009 Doug Zongker <dougz@android.com> am 9dbc027b: fix sim build in donut, too

Merge commit '9dbc027b5f540bcf23c968398f8a70e92abd56cd'

* commit '9dbc027b5f540bcf23c968398f8a70e92abd56cd':
fix sim build in donut, too
6c301e244d0d14e3b2983350d7c383abf52b89f7 12-Jun-2009 Doug Zongker <dougz@android.com> am 9931f7f3: edify extensions for OTA package installation, part 1

Merge commit '9931f7f3c1288171319e9ff7d053ebaad07db720'

* commit '9931f7f3c1288171319e9ff7d053ebaad07db720':
edify extensions for OTA package installation, part 1
9dbc027b5f540bcf23c968398f8a70e92abd56cd 12-Jun-2009 Doug Zongker <dougz@android.com> fix sim build in donut, too
ndroid.mk
c3885fabda7f8a4bd39f42f76012e00514b0a3ff 12-Jun-2009 Doug Zongker <dougz@android.com> fix simulator build by excluding more of recovery
ndroid.mk
9931f7f3c1288171319e9ff7d053ebaad07db720 10-Jun-2009 Doug Zongker <dougz@android.com> 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).
ndroid.mk
dify/Android.mk
dify/README
dify/expr.c
dify/expr.h
dify/lexer.l
dify/main.c
nstall.c
pdater/Android.mk
pdater/install.c
pdater/install.h
pdater/updater.c
pdater/updater.h
cbb91293450f893be80edd30a3dbe21566181af5 11-Jun-2009 Doug Zongker <dougz@android.com> fix error from change 3606

When I changed the definition of device_perform_action() in response
to a reviewer comment, I forgot to change this implementation.
efault_recovery_ui.c
ddd6a2865db5c73a4bb9d486f71a8c2f1f96ec69 09-Jun-2009 Doug Zongker <dougz@android.com> split out device-specific recovery UI code into vendor directories

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.
ndroid.mk
efault_recovery_ui.c
inui/minui.h
ecovery.c
ecovery_ui.h
i.c
d9d9d1785ac1cce150010390a17188bea42a7a58 10-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 9b9c2114: Merge change 3514 into donut

Merge commit '9b9c2114bd7d02200ce43cb9ec513473079dfad9'

* commit '9b9c2114bd7d02200ce43cb9ec513473079dfad9':
core of edify, an eventual replacement for amend
9b9c2114bd7d02200ce43cb9ec513473079dfad9 10-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 3514 into donut

* changes:
core of edify, an eventual replacement for amend
37bee62aefb5ac10716054edf482fd37078f1427 09-Jun-2009 Doug Zongker <dougz@android.com> 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.
dify/Android.mk
dify/README
dify/expr.c
dify/expr.h
dify/lexer.l
dify/main.c
dify/parser.y
573fd7b68b789e5a4d0b3da3b499e5555e0faee0 06-Jun-2009 Rebecca Schultz Zavin <rebecca@android.com> Force the fb into 16 bpp mode in case the hw has some other default.

Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
inui/graphics.c
825915dc6c9a731895dfe8cf25becb81fc9f988f 05-Jun-2009 Doug Zongker <dougz@android.com> am b2ee9201: allow OTA package to provide binary instead of script

Merge commit 'b2ee9201be583b17ddbf0eaa69a37545f992b565'

* commit 'b2ee9201be583b17ddbf0eaa69a37545f992b565':
allow OTA package to provide binary instead of script
b2ee9201be583b17ddbf0eaa69a37545f992b565 04-Jun-2009 Doug Zongker <dougz@android.com> 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.
nstall.c
8caf81fa24a4e74ef4cba0449cb218e1d23a421d 03-Jun-2009 Doug Zongker <dougz@android.com> am f28c916e: remove unused permissions scheme from amend

Merge commit 'f28c916e73ee9f643c67c70d059c70381d774cb0'

* commit 'f28c916e73ee9f643c67c70d059c70381d774cb0':
remove unused permissions scheme from amend
f28c916e73ee9f643c67c70d059c70381d774cb0 03-Jun-2009 Doug Zongker <dougz@android.com> 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.
mend/Android.mk
mend/amend.c
mend/commands.c
mend/commands.h
mend/main.c
mend/permissions.c
mend/permissions.h
mend/register.c
mend/test_commands.c
mend/test_permissions.c
ommands.c
ecovery.c
9d5be8488f7fc757604e654f86e2c41f54790132 01-Jun-2009 Doug Zongker <dougz@android.com> am 07e1dca7: don\'t say "install complete" when it really isn\'t

Merge commit '07e1dca7068284c4f3013550335029eb72b39b82'

* commit '07e1dca7068284c4f3013550335029eb72b39b82':
don't say "install complete" when it really isn't
07e1dca7068284c4f3013550335029eb72b39b82 29-May-2009 Doug Zongker <dougz@android.com> 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."
irmware.c
irmware.h
nstall.c
ecovery.c
985d95f9f45baeb5f013fde9575acc8a81746bcb 08-May-2009 Doug Zongker <dougz@android.com> am 1c4ceae: undo temporary alignment hack

Merge commit '1c4ceae38f3fd7eb1e451d430acb5d99f257b0f9'

* commit '1c4ceae38f3fd7eb1e451d430acb5d99f257b0f9':
undo temporary alignment hack
1c4ceae38f3fd7eb1e451d430acb5d99f257b0f9 08-May-2009 Doug Zongker <dougz@android.com> 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.
inzip/Zip.c
inzip/Zip.h
1c10ff34b51637155b234703100b82ed9e1ba947 06-May-2009 Doug Zongker <dougz@android.com> am 683c462: align data passed to write() on 32k boundaries

Merge commit '683c4628039a8cb6dad1a086fae23a7d71438414'

* commit '683c4628039a8cb6dad1a086fae23a7d71438414':
align data passed to write() on 32k boundaries
683c4628039a8cb6dad1a086fae23a7d71438414 06-May-2009 Doug Zongker <dougz@android.com> 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).
inzip/Zip.c
inzip/Zip.h
0f03d1408d9f7662df40e50a6e1c3f5a69d9f2fb 30-Apr-2009 Doug Zongker <dougz@android.com> am 596271f: handle short writes when unzipping files

Merge commit '596271fa71d79e3eec03c7cf6ac76cb026dd8578'

* commit '596271fa71d79e3eec03c7cf6ac76cb026dd8578':
handle short writes when unzipping files
596271fa71d79e3eec03c7cf6ac76cb026dd8578 30-Apr-2009 Doug Zongker <dougz@android.com> 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.
inzip/Zip.c
7fce23fbb55ac4f8ed42cf0fc25f157fdb1df97c 23-Apr-2009 Jean-Baptiste Queru <jbq@google.com> Merge donut into master
f554ceb0500f75c425b37c74a0d65d138c0fbdd0 23-Apr-2009 Jean-Baptiste Queru <jbq@google.com> merge cupcake into donut
29fcea15647746cd98b844ca2cf8b355d03f940c 23-Apr-2009 Jean-Baptiste Queru <jbq@google.com> Merge donut into master
275acbe70a8024951db39d6b415cbe63ce09f965 02-Apr-2009 Doug Zongker <> Merge branch 'readonly-p4-master'
796901d3b0b70f09c51b877ae76e98bf0cf2b82a 02-Apr-2009 Doug Zongker <> AI 144132: am: CL 144130 Don't build OTA package keys into the recovery binary; read
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
ndroid.mk
nstall.c
d5ebb7b06d4ba5674735463b3fe26d8fa9dcd896 02-Apr-2009 Doug Zongker <> Merge branch 'readonly-p4-master'
0555388b8c1a118f4756d04d73384e55d2ed6602 02-Apr-2009 Doug Zongker <> AI 144105: am: CL 144082 Remove the unused "unpacking" recovery icon.
Original author: dougz
Merged from: //branches/donutburger/...

Automated import of CL 144105
ommon.h
es/images/icon_unpacking.png
i.c
5d30026ddb1da1de7ec1b9996673f1a444d9241f 02-Apr-2009 Doug Zongker <> Merge branch 'readonly-p4-master'
fc3ada0c116056d5d7e62477a45ac68632b69ca4 02-Apr-2009 Doug Zongker <> AI 144101: am: CL 144070 Add an option to wipe cache (only) to the recovery menu.
Original author: dougz
Merged from: //branches/donutburger/...

Automated import of CL 144101
ecovery.c
d1b19b9c98ac97db5c933d72dac5dca054a28353 02-Apr-2009 Doug Zongker <> AI 144130: Don't build OTA package keys into the recovery binary; read
them from an external file in the recovery image. Use the
test-keys for all builds.

Automated import of CL 144130
ndroid.mk
nstall.c
49283858fb6565a5da0c5987e614f60254e61804 01-Apr-2009 Doug Zongker <> AI 144082: Remove the unused "unpacking" recovery icon.

Automated import of CL 144082
ommon.h
es/images/icon_unpacking.png
i.c
1066d2c31990e3c2eacedbe0a70013da774fcf3e 01-Apr-2009 Doug Zongker <> AI 144070: Add an option to wipe cache (only) to the recovery menu.

Automated import of CL 144070
ecovery.c
36a9c1e53094c54dc19be8b23b648664a1ad89fe 29-Mar-2009 The Android Open Source Project <initial-contribution@android.com> Merge branch 'open_source_no_contributions' into google_internal
19faefad052ee26285e52e3adb8994a4d4e71c38 28-Mar-2009 Doug Zongker <> AI 143289: am: CL 143128 Use PNG instead of BMP for recovery image icons. This saves
about 60k from the recovery and system images.
Original author: dougz
Merged from: //branches/donutburger/...

Automated import of CL 143289
ndroid.mk
inui/resources.c
es/images/icon_error.bmp
es/images/icon_error.png
es/images/icon_firmware_error.bmp
es/images/icon_firmware_error.png
es/images/icon_firmware_install.bmp
es/images/icon_firmware_install.png
es/images/icon_installing.bmp
es/images/icon_installing.png
es/images/icon_unpacking.bmp
es/images/icon_unpacking.png
es/images/indeterminate1.bmp
es/images/indeterminate1.png
es/images/indeterminate2.bmp
es/images/indeterminate2.png
es/images/indeterminate3.bmp
es/images/indeterminate3.png
es/images/indeterminate4.bmp
es/images/indeterminate4.png
es/images/indeterminate5.bmp
es/images/indeterminate5.png
es/images/indeterminate6.bmp
es/images/indeterminate6.png
es/images/progress_bar_empty.bmp
es/images/progress_bar_empty.png
es/images/progress_bar_empty_left_round.bmp
es/images/progress_bar_empty_left_round.png
es/images/progress_bar_empty_right_round.bmp
es/images/progress_bar_empty_right_round.png
es/images/progress_bar_fill.bmp
es/images/progress_bar_fill.png
es/images/progress_bar_left_round.bmp
es/images/progress_bar_left_round.png
es/images/progress_bar_right_round.bmp
es/images/progress_bar_right_round.png
b2b467c757ed5db6b91c6f5b53a3476fb9c92782 27-Mar-2009 The Android Open Source Project <initial-contribution@android.com> Merge commit 'korg/cupcake'
58bde316e22e392885de71d2391f2bc7f438ff1f 27-Mar-2009 Doug Zongker <> AI 143128: Use PNG instead of BMP for recovery image icons. This saves
about 60k from the recovery and system images.

Automated import of CL 143128
ndroid.mk
inui/resources.c
es/images/icon_error.bmp
es/images/icon_error.png
es/images/icon_firmware_error.bmp
es/images/icon_firmware_error.png
es/images/icon_firmware_install.bmp
es/images/icon_firmware_install.png
es/images/icon_installing.bmp
es/images/icon_installing.png
es/images/icon_unpacking.bmp
es/images/icon_unpacking.png
es/images/indeterminate1.bmp
es/images/indeterminate1.png
es/images/indeterminate2.bmp
es/images/indeterminate2.png
es/images/indeterminate3.bmp
es/images/indeterminate3.png
es/images/indeterminate4.bmp
es/images/indeterminate4.png
es/images/indeterminate5.bmp
es/images/indeterminate5.png
es/images/indeterminate6.bmp
es/images/indeterminate6.png
es/images/progress_bar_empty.bmp
es/images/progress_bar_empty.png
es/images/progress_bar_empty_left_round.bmp
es/images/progress_bar_empty_left_round.png
es/images/progress_bar_empty_right_round.bmp
es/images/progress_bar_empty_right_round.png
es/images/progress_bar_fill.bmp
es/images/progress_bar_fill.png
es/images/progress_bar_left_round.bmp
es/images/progress_bar_left_round.png
es/images/progress_bar_right_round.bmp
es/images/progress_bar_right_round.png
e6faba0580017352bcba4efefac032095d337042 25-Mar-2009 Doug Zongker <> Automated import from //branches/master/...@142142,142142
ools/ota/make-update-script.c
bc012de46e99fc936e6c06d19416b8414835c7b6 25-Mar-2009 Doug Zongker <> Automated import from //branches/donutburger/...@142141,142141
ools/ota/make-update-script.c
d105f8f84f25db7861775e07a808855334207d95 25-Mar-2009 Doug Zongker <> Automated import from //branches/cupcake/...@142138,142138
ools/ota/make-update-script.c
cf5b17055b1276c187537cf5a054cf6ebe753113 25-Mar-2009 Dianne Hackborn <> Automated import from //branches/donutburger/...@140818,140818
OTICE
97c618f37883e36b798a15b36cae917e7bc1e0c0 25-Mar-2009 Dianne Hackborn <> Automated import from //branches/master/...@140824,140824
OTICE
73e8e9ba08f288b7cc9ea62be9782dc1398a2d41 20-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake_rel/...@141571
OTICE
c5c389f8f2b43a640667aa53ee3e369033c55569 19-Mar-2009 Jean-Baptiste Queru <jbq@google.com> Merge commit 'remotes/korg/cupcake' into cupcake_to_master
c24a8e688a6312764254beac2b2520bb0c5e998d 04-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@135843
ndroid.mk
mend/Android.mk
mend/amend.c
mend/amend.h
mend/ast.c
mend/ast.h
mend/commands.c
mend/commands.h
mend/execute.c
mend/execute.h
mend/lexer.h
mend/lexer.l
mend/main.c
mend/parser.h
mend/parser_y.y
mend/permissions.c
mend/permissions.h
mend/register.c
mend/register.h
mend/symtab.c
mend/symtab.h
mend/test_commands.c
mend/test_permissions.c
mend/test_symtab.c
mend/tests/001-nop/expected.txt
mend/tests/001-nop/info.txt
mend/tests/001-nop/run
mend/tests/002-lex-empty/SKIP
mend/tests/002-lex-empty/expected.txt
mend/tests/002-lex-empty/info.txt
mend/tests/002-lex-empty/input
mend/tests/002-lex-empty/run
mend/tests/003-lex-command/expected.txt
mend/tests/003-lex-command/info.txt
mend/tests/003-lex-command/input
mend/tests/003-lex-command/input2
mend/tests/003-lex-command/input3
mend/tests/003-lex-command/input4
mend/tests/003-lex-command/run
mend/tests/004-lex-comment/expected.txt
mend/tests/004-lex-comment/info.txt
mend/tests/004-lex-comment/input
mend/tests/004-lex-comment/run
mend/tests/005-lex-quoted-string/expected.txt
mend/tests/005-lex-quoted-string/info.txt
mend/tests/005-lex-quoted-string/input
mend/tests/005-lex-quoted-string/input2
mend/tests/005-lex-quoted-string/input3
mend/tests/005-lex-quoted-string/run
mend/tests/006-lex-words/SKIP
mend/tests/006-lex-words/expected.txt
mend/tests/006-lex-words/info.txt
mend/tests/006-lex-words/input
mend/tests/006-lex-words/input2
mend/tests/006-lex-words/input3
mend/tests/006-lex-words/run
mend/tests/007-lex-real-script/expected.txt
mend/tests/007-lex-real-script/info.txt
mend/tests/007-lex-real-script/input
mend/tests/007-lex-real-script/run
mend/tests/008-parse-real-script/expected.txt
mend/tests/008-parse-real-script/info.txt
mend/tests/008-parse-real-script/input
mend/tests/008-parse-real-script/run
mend/tests/XXX-long-token/SKIP
mend/tests/XXX-stack-overflow/SKIP
mend/tests/one-test
mend/tests/run-all-tests
ootloader.c
ootloader.h
ommands.c
ommands.h
ommon.h
tc/META-INF/com/google/android/update-script
tc/init.rc
irmware.c
irmware.h
nstall.c
nstall.h
inui/Android.mk
inui/events.c
inui/font_10x18.h
inui/graphics.c
inui/minui.h
inui/mkfont.c
inui/resources.c
inzip/Android.mk
inzip/Bits.h
inzip/DirUtil.c
inzip/DirUtil.h
inzip/Hash.c
inzip/Hash.h
inzip/Inlines.c
inzip/Log.h
inzip/SysUtil.c
inzip/SysUtil.h
inzip/Zip.c
inzip/Zip.h
inzip/inline_magic.h
tdutils/Android.mk
tdutils/flash_image.c
tdutils/mounts.c
tdutils/mounts.h
tdutils/mtdutils.c
tdutils/mtdutils.h
ecovery.c
es/images/icon_error.bmp
es/images/icon_firmware_error.bmp
es/images/icon_firmware_install.bmp
es/images/icon_installing.bmp
es/images/icon_unpacking.bmp
es/images/indeterminate1.bmp
es/images/indeterminate2.bmp
es/images/indeterminate3.bmp
es/images/indeterminate4.bmp
es/images/indeterminate5.bmp
es/images/indeterminate6.bmp
es/images/progress_bar_empty.bmp
es/images/progress_bar_empty_left_round.bmp
es/images/progress_bar_empty_right_round.bmp
es/images/progress_bar_fill.bmp
es/images/progress_bar_left_round.bmp
es/images/progress_bar_right_round.bmp
oots.c
oots.h
est_roots.c
ools/Android.mk
ools/ota/Android.mk
ools/ota/add-property-tag.c
ools/ota/check-lost+found.c
ools/ota/convert-to-bmp.py
ools/ota/make-update-script.c
i.c
erifier.c
erifier.h
ffb48f64fec674c6dd923eb8b1eb3f743e05a8ba 04-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@135843
ndroid.mk
mend/Android.mk
mend/amend.c
mend/amend.h
mend/ast.c
mend/ast.h
mend/commands.c
mend/commands.h
mend/execute.c
mend/execute.h
mend/lexer.h
mend/lexer.l
mend/main.c
mend/parser.h
mend/parser_y.y
mend/permissions.c
mend/permissions.h
mend/register.c
mend/register.h
mend/symtab.c
mend/symtab.h
mend/test_commands.c
mend/test_permissions.c
mend/test_symtab.c
mend/tests/001-nop/expected.txt
mend/tests/001-nop/info.txt
mend/tests/001-nop/run
mend/tests/002-lex-empty/SKIP
mend/tests/002-lex-empty/expected.txt
mend/tests/002-lex-empty/info.txt
mend/tests/002-lex-empty/input
mend/tests/002-lex-empty/run
mend/tests/003-lex-command/expected.txt
mend/tests/003-lex-command/info.txt
mend/tests/003-lex-command/input
mend/tests/003-lex-command/input2
mend/tests/003-lex-command/input3
mend/tests/003-lex-command/input4
mend/tests/003-lex-command/run
mend/tests/004-lex-comment/expected.txt
mend/tests/004-lex-comment/info.txt
mend/tests/004-lex-comment/input
mend/tests/004-lex-comment/run
mend/tests/005-lex-quoted-string/expected.txt
mend/tests/005-lex-quoted-string/info.txt
mend/tests/005-lex-quoted-string/input
mend/tests/005-lex-quoted-string/input2
mend/tests/005-lex-quoted-string/input3
mend/tests/005-lex-quoted-string/run
mend/tests/006-lex-words/SKIP
mend/tests/006-lex-words/expected.txt
mend/tests/006-lex-words/info.txt
mend/tests/006-lex-words/input
mend/tests/006-lex-words/input2
mend/tests/006-lex-words/input3
mend/tests/006-lex-words/run
mend/tests/007-lex-real-script/expected.txt
mend/tests/007-lex-real-script/info.txt
mend/tests/007-lex-real-script/input
mend/tests/007-lex-real-script/run
mend/tests/008-parse-real-script/expected.txt
mend/tests/008-parse-real-script/info.txt
mend/tests/008-parse-real-script/input
mend/tests/008-parse-real-script/run
mend/tests/XXX-long-token/SKIP
mend/tests/XXX-stack-overflow/SKIP
mend/tests/one-test
mend/tests/run-all-tests
ootloader.c
ootloader.h
ommands.c
ommands.h
ommon.h
tc/META-INF/com/google/android/update-script
tc/init.rc
irmware.c
irmware.h
nstall.c
nstall.h
inui/Android.mk
inui/events.c
inui/font_10x18.h
inui/graphics.c
inui/minui.h
inui/mkfont.c
inui/resources.c
inzip/Android.mk
inzip/Bits.h
inzip/DirUtil.c
inzip/DirUtil.h
inzip/Hash.c
inzip/Hash.h
inzip/Inlines.c
inzip/Log.h
inzip/SysUtil.c
inzip/SysUtil.h
inzip/Zip.c
inzip/Zip.h
inzip/inline_magic.h
tdutils/Android.mk
tdutils/flash_image.c
tdutils/mounts.c
tdutils/mounts.h
tdutils/mtdutils.c
tdutils/mtdutils.h
ecovery.c
es/images/icon_error.bmp
es/images/icon_firmware_error.bmp
es/images/icon_firmware_install.bmp
es/images/icon_installing.bmp
es/images/icon_unpacking.bmp
es/images/indeterminate1.bmp
es/images/indeterminate2.bmp
es/images/indeterminate3.bmp
es/images/indeterminate4.bmp
es/images/indeterminate5.bmp
es/images/indeterminate6.bmp
es/images/progress_bar_empty.bmp
es/images/progress_bar_empty_left_round.bmp
es/images/progress_bar_empty_right_round.bmp
es/images/progress_bar_fill.bmp
es/images/progress_bar_left_round.bmp
es/images/progress_bar_right_round.bmp
oots.c
oots.h
est_roots.c
ools/Android.mk
ools/ota/Android.mk
ools/ota/add-data-wipe
ools/ota/add-property-tag.c
ools/ota/check-lost+found.c
ools/ota/convert-to-bmp.py
ools/ota/make-update-script.c
ools/ota/otatool
i.c
erifier.c
erifier.h
d4ae69739ebb67374d62229829df07bf2de85103 03-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@132589
ools/ota/add-data-wipe
ools/ota/otatool
15bb56d89aff63b233edca99f41d8943ffde6b1c 03-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@137055
ools/ota/add-data-wipe
ools/ota/otatool
fac53c16773283f0dc4da544553174d9fe516b16 02-Mar-2009 Jean-Baptiste Queru <jbq@google.com> Remove obsolete OTA tools

Resolves http://code.google.com/p/android/issues/detail?id=2077
ools/ota/add-data-wipe
ools/ota/otatool
8b7334b3c2f891f516722851575fec43bd28b4cf 11-Feb-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@130745
ommon.h
inui/graphics.c
ecovery.c
i.c
6d12e0d6f8fe05ebd6b0210fed00e0ff874a3d70 10-Jan-2009 The Android Open Source Project <initial-contribution@android.com> Merge branch 'cupcake'
928d471ef2bfa359e16426cd993ba6f9b07ee16e 10-Jan-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@125939
ecovery.c
ff3d93821e22588ce607c17252334ca2d9ca54a4 18-Dec-2008 The Android Open Source Project <initial-contribution@android.com> Code drop from //branches/cupcake/...@124589
ndroid.mk
inui/graphics.c
tdutils/Android.mk
es/images/icon_firmware_install.bmp
es/images/icon_installing.bmp
ools/Android.mk
ools/ota/Android.mk
ools/ota/add-property-tag.c
ools/ota/check-lost+found.c
ools/ota/make-update-script.c
erifier.c
23580ca27a0a8109312fdd36cc363ad1f4719889 21-Oct-2008 The Android Open Source Project <initial-contribution@android.com> Initial Contribution
ndroid.mk
mend/Android.mk
mend/amend.c
mend/amend.h
mend/ast.c
mend/ast.h
mend/commands.c
mend/commands.h
mend/execute.c
mend/execute.h
mend/lexer.h
mend/lexer.l
mend/main.c
mend/parser.h
mend/parser_y.y
mend/permissions.c
mend/permissions.h
mend/register.c
mend/register.h
mend/symtab.c
mend/symtab.h
mend/test_commands.c
mend/test_permissions.c
mend/test_symtab.c
mend/tests/001-nop/expected.txt
mend/tests/001-nop/info.txt
mend/tests/001-nop/run
mend/tests/002-lex-empty/SKIP
mend/tests/002-lex-empty/expected.txt
mend/tests/002-lex-empty/info.txt
mend/tests/002-lex-empty/input
mend/tests/002-lex-empty/run
mend/tests/003-lex-command/expected.txt
mend/tests/003-lex-command/info.txt
mend/tests/003-lex-command/input
mend/tests/003-lex-command/input2
mend/tests/003-lex-command/input3
mend/tests/003-lex-command/input4
mend/tests/003-lex-command/run
mend/tests/004-lex-comment/expected.txt
mend/tests/004-lex-comment/info.txt
mend/tests/004-lex-comment/input
mend/tests/004-lex-comment/run
mend/tests/005-lex-quoted-string/expected.txt
mend/tests/005-lex-quoted-string/info.txt
mend/tests/005-lex-quoted-string/input
mend/tests/005-lex-quoted-string/input2
mend/tests/005-lex-quoted-string/input3
mend/tests/005-lex-quoted-string/run
mend/tests/006-lex-words/SKIP
mend/tests/006-lex-words/expected.txt
mend/tests/006-lex-words/info.txt
mend/tests/006-lex-words/input
mend/tests/006-lex-words/input2
mend/tests/006-lex-words/input3
mend/tests/006-lex-words/run
mend/tests/007-lex-real-script/expected.txt
mend/tests/007-lex-real-script/info.txt
mend/tests/007-lex-real-script/input
mend/tests/007-lex-real-script/run
mend/tests/008-parse-real-script/expected.txt
mend/tests/008-parse-real-script/info.txt
mend/tests/008-parse-real-script/input
mend/tests/008-parse-real-script/run
mend/tests/XXX-long-token/SKIP
mend/tests/XXX-stack-overflow/SKIP
mend/tests/one-test
mend/tests/run-all-tests
ootloader.c
ootloader.h
ommands.c
ommands.h
ommon.h
tc/META-INF/com/google/android/update-script
tc/init.rc
irmware.c
irmware.h
nstall.c
nstall.h
inui/Android.mk
inui/events.c
inui/font_10x18.h
inui/graphics.c
inui/minui.h
inui/mkfont.c
inui/resources.c
inzip/Android.mk
inzip/Bits.h
inzip/DirUtil.c
inzip/DirUtil.h
inzip/Hash.c
inzip/Hash.h
inzip/Inlines.c
inzip/Log.h
inzip/SysUtil.c
inzip/SysUtil.h
inzip/Zip.c
inzip/Zip.h
inzip/inline_magic.h
tdutils/Android.mk
tdutils/flash_image.c
tdutils/mounts.c
tdutils/mounts.h
tdutils/mtdutils.c
tdutils/mtdutils.h
ecovery.c
es/images/icon_error.bmp
es/images/icon_firmware_error.bmp
es/images/icon_firmware_install.bmp
es/images/icon_installing.bmp
es/images/icon_unpacking.bmp
es/images/indeterminate1.bmp
es/images/indeterminate2.bmp
es/images/indeterminate3.bmp
es/images/indeterminate4.bmp
es/images/indeterminate5.bmp
es/images/indeterminate6.bmp
es/images/progress_bar_empty.bmp
es/images/progress_bar_empty_left_round.bmp
es/images/progress_bar_empty_right_round.bmp
es/images/progress_bar_fill.bmp
es/images/progress_bar_left_round.bmp
es/images/progress_bar_right_round.bmp
oots.c
oots.h
est_roots.c
ools/ota/Android.mk
ools/ota/add-data-wipe
ools/ota/convert-to-bmp.py
ools/ota/make-update-script.c
ools/ota/otatool
i.c
erifier.c
erifier.h