Commit graph

3321 commits

Author SHA1 Message Date
Doug Zongker
2ec8a1929f am 54ec81fe: Merge change I1c8ca2e4 into eclair
Merge commit '54ec81fe86225d5f3ee3ab16e3266ae88cd639fa'

* commit '54ec81fe86225d5f3ee3ab16e3266ae88cd639fa':
  replace generic recovery icons
2009-10-12 12:40:12 -07:00
Doug Zongker
022229c47e 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
2009-10-12 11:45:31 -07:00
Doug Zongker
d93a25459c 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.
2009-10-08 16:32:58 -07:00
Doug Zongker
d641a0e141 am 54ec81fe: Merge change I1c8ca2e4 into eclair
Merge commit '54ec81fe86225d5f3ee3ab16e3266ae88cd639fa' into eclair-plus-aosp

* commit '54ec81fe86225d5f3ee3ab16e3266ae88cd639fa':
  replace generic recovery icons
2009-10-07 17:17:41 -07:00
Android (Google) Code Review
54ec81fe86 Merge change I1c8ca2e4 into eclair
* changes:
  replace generic recovery icons
2009-10-07 20:09:16 -04:00
Doug Zongker
42ab176195 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
2009-10-07 11:57:04 -07:00
Doug Zongker
988500b615 add terminator to recovery's getopt_long options array
http://b/2170691 - recovery argument parsing is broken
2009-10-06 14:44:54 -07:00
Doug Zongker
1c8ca2e40b replace generic recovery icons 2009-10-02 15:42:31 -07:00
Doug Zongker
4526d4fe62 am 8f8bc4cb: am f93d8166: confirm before wiping user data in recovery
Merge commit '8f8bc4cb487e0f853c97cb5ff1481d707ac6b66d'

* commit '8f8bc4cb487e0f853c97cb5ff1481d707ac6b66d':
  confirm before wiping user data in recovery
2009-09-25 08:45:47 -07:00
Doug Zongker
8f8bc4cb48 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
2009-09-22 18:28:19 -07:00
Doug Zongker
f93d8166ef 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.)
2009-09-22 18:16:56 -07:00
Doug Zongker
83a25d7380 am 486aa290: am fd8fb0c4: reduce fraction of progress bar for verification
Merge commit '486aa290635dbf6f60b3435694951fed3470ffdf'

* commit '486aa290635dbf6f60b3435694951fed3470ffdf':
  reduce fraction of progress bar for verification
2009-09-20 14:40:27 -07:00
Doug Zongker
486aa29063 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
2009-09-20 14:30:37 -07:00
Doug Zongker
fd8fb0c492 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.
2009-09-20 14:10:27 -07:00
Doug Zongker
66c76bcfcf am d16fb221: am 60babf8b: delete files before symlinking; log error messages
Merge commit 'd16fb221cd27abea8a954bd5f6554fa116366519'

* commit 'd16fb221cd27abea8a954bd5f6554fa116366519':
  delete files before symlinking; log error messages
2009-09-18 18:15:46 -07:00
Doug Zongker
d16fb221cd 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
2009-09-18 15:49:37 -07:00
Doug Zongker
60babf8ba7 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).
2009-09-18 15:11:24 -07:00
Doug Zongker
b9ad6dfd81 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
2009-09-17 06:38:28 -07:00
Doug Zongker
2f4fc56183 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
2009-09-15 13:46:00 -07:00
Doug Zongker
196c25c777 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).
2009-09-15 08:50:04 -07:00
Doug Zongker
49c82ce553 am b5d542cd: am a3f89eab: add a run_program() function to edify
Merge commit 'b5d542cd40360867bc00cdb9266c0abf26448c55'

* commit 'b5d542cd40360867bc00cdb9266c0abf26448c55':
  add a run_program() function to edify
2009-09-10 14:41:05 -07:00
Doug Zongker
b5d542cd40 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
2009-09-10 14:30:43 -07:00
Doug Zongker
a3f89eabb7 add a run_program() function to edify
Handy for producing debugging OTA packages (eg, running sqlite3 or
whatever in recovery).
2009-09-10 14:20:53 -07:00
Jean-Baptiste Queru
af42fa0a7d am 9a77b613: merge from open-source master
Merge commit '9a77b613f3fdf6340b0f5f24d1c725fd0001e4a9'

* commit '9a77b613f3fdf6340b0f5f24d1c725fd0001e4a9':
2009-09-04 11:05:32 -07:00
Jean-Baptiste Queru
9a77b613f3 merge from open-source master 2009-09-04 07:50:41 -07:00
Jean-Baptiste Queru
65a56909a3 merge from donut 2009-09-03 14:12:45 -07:00
Jean-Baptiste Queru
2f39bf9a9f am cbf90380: merge from open-source master
Merge commit 'cbf903803850deb4f70490d97a1603e7b8679cc2'

* commit 'cbf903803850deb4f70490d97a1603e7b8679cc2':
  Not all failures to fopen_root_path() are serious.
2009-09-01 12:14:02 -07:00
Jean-Baptiste Queru
cbf9038038 merge from open-source master 2009-09-01 08:27:43 -07:00
Jay Freeman (saurik)
619ec2f3aa Not all failures to fopen_root_path() are serious.
Example: E:Can't open /cache/recovery/command.
2009-08-25 12:53:40 -07:00
Doug Zongker
6785c2534a am 34c98df7: (-s ours) do not merge: cherry-pick of c2d666bd4f from master
Merge commit '34c98df78a80881698f63ce0815f3e16823d85e0'

* commit '34c98df78a80881698f63ce0815f3e16823d85e0':
  do not merge: cherry-pick of c2d666bd4f from master
2009-08-18 12:13:35 -07:00
Doug Zongker
34c98df78a do not merge: cherry-pick of c2d666bd4f from master 2009-08-18 12:05:45 -07:00
Jared Suttles
c2d666bd4f 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>
2009-08-17 17:39:54 -07:00
Doug Zongker
50a8a71f0b am 54e2e86c: (-s ours) do not merge: cherry-picked 60151a295c from master branch
Merge commit '54e2e86c5740a2c7a02e95e94c4aff362a5502cf'

* commit '54e2e86c5740a2c7a02e95e94c4aff362a5502cf':
  do not merge: cherry-picked 60151a295c from master branch
2009-08-17 14:11:31 -07:00
Doug Zongker
54e2e86c57 do not merge: cherry-picked 60151a295c from master branch 2009-08-17 13:21:04 -07:00
Doug Zongker
60151a295c 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
2009-08-14 17:26:33 -07:00
Jean-Baptiste Queru
0cf0e33b5f merge from open-source master 2009-08-04 09:00:15 -07:00
Doug Zongker
b9955b8373 am 20697b96: only build flash_image for eng
Merge commit '20697b965cd923211daeea2037f60218358b9659'

* commit '20697b965cd923211daeea2037f60218358b9659':
  only build flash_image for eng
2009-08-04 08:44:43 -07:00
Jean-Baptiste Queru
34109de24e merge from donut 2009-07-29 14:56:48 -07:00
Jean-Baptiste Queru
eb1ac27bf0 reconcile korg/master into goog/master 2009-07-26 11:43:53 -07:00
Jean-Baptiste Queru
7bd5c66075 Merge korg/donut into korg/master 2009-07-25 17:48:00 -07:00
Doug Zongker
20697b965c 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.
2009-07-23 15:17:00 -07:00
Doug Zongker
23412e6f14 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.
2009-07-23 10:36:43 -07:00
Doug Zongker
608fa02e1a resolved conflicts for merge of 64893ccc to master 2009-07-15 18:10:28 -07:00
Doug Zongker
64893ccc09 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.
2009-07-14 16:58:42 -07:00
Doug Zongker
c457ff6436 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
2009-07-02 15:24:19 -07:00
Doug Zongker
bec02d57fb 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.
2009-07-01 12:09:29 -07:00
Android (Google) Code Review
fc382dfc75 am d8f7c9b8: Merge change 5545 into donut
Merge commit 'd8f7c9b85e25fab93fef2221a84b60edc2e7b837'

* commit 'd8f7c9b85e25fab93fef2221a84b60edc2e7b837':
  remove updater from the user system image
2009-06-29 16:39:15 -07:00
Android (Google) Code Review
d8f7c9b85e Merge change 5545 into donut
* changes:
  remove updater from the user system image
2009-06-26 14:42:37 -07:00
Doug Zongker
ad3db099d5 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.
2009-06-26 13:38:55 -07:00
Doug Zongker
898ef399d3 am 0bbfe3d9: fix off-by-one error in set_perm()
Merge commit '0bbfe3d901885c1f0ab006e8d4cc1029c44a7376'

* commit '0bbfe3d901885c1f0ab006e8d4cc1029c44a7376':
  fix off-by-one error in set_perm()
2009-06-25 14:34:03 -07:00