Commit Graph

576 Commits

Author SHA1 Message Date
John Reck 94fd07ba6d Update libpng API usage
Remove usage of deprecated methods

Change-Id: I747568a2c8c0c65ecbc9a3da4bac7b9cac7708ab
2013-08-26 16:45:33 -07:00
Doug Zongker a69b50c567 am 901b898d: recovery: remove O_DIRECT, use O_SYNC only
* commit '901b898d5e4d7cc555974b8132f83f948f8fbaee':
  recovery: remove O_DIRECT, use O_SYNC only
2013-07-11 12:42:54 -07:00
Doug Zongker 901b898d5e recovery: remove O_DIRECT, use O_SYNC only
O_DIRECT writes fail with EINVAL due to alignment issues.

Change-Id: If8cf38a636313e4f4b4e61e66287dc903c473e5b
2013-07-11 12:31:25 -07:00
Doug Zongker 660637f3fc am e8d953aa: recovery: more cargo-cult programming
* commit 'e8d953aa7ed0c16beb1b03a05d16cb23dd85e198':
  recovery: more cargo-cult programming
2013-07-11 12:22:22 -07:00
Doug Zongker e8d953aa7e recovery: more cargo-cult programming
Add O_DIRECT|O_SYNC when opening partitions for write.

Change-Id: I9825ad8e60fba87e482f8abc5593d6f54a1e3a1c
2013-07-11 12:11:11 -07:00
The Android Open Source Project 51ffaf54a5 Reconcile with jb-mr2-release - do not merge
Change-Id: Id35004f465f5152c1de0796eb66989f234185208
2013-07-11 08:22:20 -07:00
Doug Zongker 166565f9fb recovery: sleep after writing partition and closing it
Another speculative attempt to get everything we write actually stored
to the device.

Change-Id: Icf40b0741b4c535e55ea34848073a97d90dc0e70
2013-07-10 18:25:21 -07:00
Doug Zongker fbcfad33fa am bf4a69ac: recovery: sleep after writing partition and closing it
* commit 'bf4a69ac41696fe78f6cc67b10cf1816186f1c5d':
  recovery: sleep after writing partition and closing it
2013-07-10 13:53:15 -07:00
Doug Zongker bf4a69ac41 recovery: sleep after writing partition and closing it
Another speculative attempt to get everything we write actually stored
to the device.

Change-Id: Icf40b0741b4c535e55ea34848073a97d90dc0e70
2013-07-10 13:46:46 -07:00
The Android Open Source Project e352c88fbc Reconcile with jb-mr2-release - do not merge
Change-Id: Ib99b7cd6aede63006c91be2635112e16dd0f2b24
2013-07-09 17:12:56 -07:00
Doug Zongker c6ab95e9d1 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
2013-07-09 16:31:07 -07:00
Doug Zongker 35c474e8c0 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
2013-07-09 16:30:22 -07:00
Doug Zongker 2148133d46 am c870a99c: recovery: write partitions more conservatively
* commit 'c870a99c4aeb9e232ee68951e666b5fa670d1680':
  recovery: write partitions more conservatively
2013-07-09 11:02:07 -07:00
Doug Zongker c870a99c4a 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
2013-07-09 10:42:15 -07:00
Doug Zongker 0ccaccf7d0 am 044a0b4d: recovery: try to write EMMC partitions more reliably
* commit '044a0b4d49a11edfa13471ce20914b0514eb7e0e':
  recovery: try to write EMMC partitions more reliably
2013-07-08 14:09:59 -07:00
Doug Zongker 044a0b4d49 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
2013-07-08 12:59:22 -07:00
yetta_wu 4d4b233eae am 2f6877a0: recovery: init backgroundIcon properly to avoid recovery mode crash
* commit '2f6877a0220475303907203308c018d789ea1a53':
  recovery: init backgroundIcon properly to avoid recovery mode crash
2013-06-25 12:56:12 -07:00
yetta_wu 2f6877a022 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>
2013-06-25 12:50:20 -07:00
Doug Zongker 8cd12112e4 am d51bfc9b: Merge "Fix the potential segmentation fault"
* commit 'd51bfc9b1fe89321af3c629e7b23a747050332e1':
  Fix the potential segmentation fault
2013-06-04 12:10:28 -07:00
Doug Zongker d51bfc9b1f Merge "Fix the potential segmentation fault" 2013-06-04 19:05:59 +00:00
Jin Feng 93ffa7579c 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>
2013-06-04 17:46:24 +08:00
Doug Zongker da1ebaef0a 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
2013-05-21 11:19:15 -07:00
Doug Zongker 7c3ae45ef9 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
2013-05-21 11:18:38 -07:00
Ying Wang 4e21482d97 Add liblog
Bug: 8580410
Change-Id: Ie60dade81c06589cb0daee431611ded34adef8e6
2013-04-09 21:41:29 -07:00
Jean-Baptiste Queru b5bd4fb795 am 2f50df00: am c09444eb: am f91bd41c: am 1c302caf: (-s ours) am c14a7fbd: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '2f50df0058dff23fbdfc6b123bb92aaa90aea09b':
2013-03-11 12:58:20 -07:00
Jean-Baptiste Queru 2f50df0058 am c09444eb: am f91bd41c: am 1c302caf: (-s ours) am c14a7fbd: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'c09444eb5b66a5702db99d9b7de23cb73bf11aa4':
2013-03-11 12:41:56 -07:00
Jean-Baptiste Queru c09444eb5b am f91bd41c: am 1c302caf: (-s ours) am c14a7fbd: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'f91bd41c46ec8bd085c361ea0bdf53efe13c87ca':
2013-03-11 12:31:59 -07:00
Jean-Baptiste Queru f91bd41c46 am 1c302caf: (-s ours) am c14a7fbd: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '1c302cafdd793ae250f767b88da718b916751feb':
2013-03-11 12:22:41 -07:00
Jean-Baptiste Queru 1c302cafdd am c14a7fbd: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'c14a7fbd895aed1ce34c0682ece5ef361f21dd1c':
2013-03-11 12:19:04 -07:00
Jean-Baptiste Queru c14a7fbd89 Reconcile with jb-mr1-release - do not merge 2013-03-11 12:15:19 -07:00
Doug Zongker 6fd59ac07d 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
2013-03-07 13:34:24 -08:00
Doug Zongker 55a36ac1e0 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
2013-03-04 16:37:44 -08:00
Nick Kralevich 869abf03e2 am ec838b88: Merge "minadbd: remove unnecessary header files."
* commit 'ec838b885dd8b74b8682dd2498c7da8f7afca291':
  minadbd: remove unnecessary header files.
2013-03-01 17:38:34 +00:00
Nick Kralevich ec838b885d Merge "minadbd: remove unnecessary header files." 2013-03-01 17:21:16 +00:00
Nick Kralevich 05aa743493 minadbd: remove unnecessary header files.
Change-Id: Iff2b53d9e63b279d0262cd2e9cfb11e0ca4d6b42
2013-03-01 09:16:26 -08:00
Ben Murdoch e729bac228 Add a CleanSpec for bootable/recovery
Change-Id: Ifa7a3aa5e2e3fd5d13266115d592bbfd0aa309c5
2013-02-22 11:29:02 +00:00
Ken Sumrall f35d1cef7c 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
2013-02-19 17:37:22 -08:00
Doug Zongker 133f56bde0 am f7d42340: am c560a67b: add optional overscan compensation to recovery graphics
* commit 'f7d423403d0aed6b8488559185e2246257abc58b':
  add optional overscan compensation to recovery graphics
2013-01-02 16:35:06 -08:00
Doug Zongker f7d423403d am c560a67b: add optional overscan compensation to recovery graphics
* commit 'c560a67b12350102ba237fa70cedc7c972ad4e4b':
  add optional overscan compensation to recovery graphics
2013-01-02 15:45:53 -08:00
Doug Zongker c560a67b12 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
2012-12-18 16:31:27 -08:00
Doug Zongker 2ad5d91b1c am 6a1d21a0: am bb01d0c1: add NextCheckKeyIsLong() and EnqueueKey() methods
* commit '6a1d21a0ceb1fb46e9113f3d2a81390612806dfd':
  add NextCheckKeyIsLong() and EnqueueKey() methods
2012-12-18 09:14:06 -08:00
Doug Zongker 6a1d21a0ce am bb01d0c1: add NextCheckKeyIsLong() and EnqueueKey() methods
* commit 'bb01d0c12b29e6ff4a9169c21c95408e7eb882c5':
  add NextCheckKeyIsLong() and EnqueueKey() methods
2012-12-18 09:11:47 -08:00
Elliott Hughes 9da1880118 am 9028fb4d: Merge "Pass the correct pointer to munmap on failure."
* commit '9028fb4d4ceed040c7d3ae9b1ceaa5a7472856ba':
  Pass the correct pointer to munmap on failure.
2012-12-17 12:11:47 -08:00
Elliott Hughes 9028fb4d4c Merge "Pass the correct pointer to munmap on failure." 2012-12-17 11:22:21 -08:00
Doug Zongker bb01d0c12b 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
2012-12-17 10:52:58 -08:00
Elliott Hughes c86f22c131 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
2012-12-17 09:26:50 -08:00
The Android Open Source Project 1fca2650ed am 27f31606: (-s ours) am aa0dbb25: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '27f31606390eeed50d27f2c243dfbfe79e8b5ae2':
2012-11-06 12:23:57 -08:00
The Android Open Source Project 27f3160639 am aa0dbb25: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit 'aa0dbb25a0ae51a8e53018fe05bf59164d9804cb':
2012-11-06 12:21:06 -08:00
The Android Open Source Project aa0dbb25a0 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: Ibef4c059b7a7e055fe562c60656a9f7f7de4841a
2012-11-06 12:16:04 -08:00
Doug Zongker 6c249f7ae8 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
2012-11-02 15:09:57 -07:00