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
Nick Kralevich and Gerrit Code Review
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
Doug Zongker and Android Git Automerger
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 and Android Git Automerger
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 and Gerrit Code Review
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 and Android Git Automerger
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
Kenny Root
cd74108cda
resolved conflicts for merge of 78afed1c to jb-mr1-dev-plus-aosp
...
Change-Id: I861e3a6aa07c448909b2ae54618bba178bd6e457
2012-10-16 17:44:21 -07:00
Kenny Root and Gerrit Code Review
78afed1c15
Merge "Remove HAVE_SELINUX guards"
2012-10-16 16:33:40 -07:00
Kenny Root
7eb7567aa3
Remove HAVE_SELINUX guards
...
Change-Id: Ia96201f20f7838d7d9e8926208977d3f8318ced4
2012-10-16 12:57:26 -07:00
The Android Open Source Project
d0d4d44d34
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
Change-Id: I3afa60bf8978d750c7072128e9f5e87c5d624b36
2012-10-10 09:43:44 -07:00
The Android Automerger
5afeff505e
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
2012-10-10 08:42:51 -07:00
The Android Automerger
a88a3b3596
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-10 06:59:08 -07:00
Devin Kim and Android Git Automerger
4b57f8f2af
am 6016d08b: recovery: fix failure to unmount "/cache"
...
* commit '6016d08b0c3b682f1f7000b42a9ea4b6b6d74f22':
recovery: fix failure to unmount "/cache"
2012-10-09 21:19:44 -07:00
The Android Open Source Project
2c3d1d83d5
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I692d63796f64702243898ae1d20d8ce073dc15e6
2012-10-09 07:28:01 -07:00
The Android Automerger
0ed4bd5e22
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-09 06:59:06 -07:00
Devin Kim and Iliyan Malchev
6016d08b0c
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 >
2012-10-08 16:34:00 -07:00
Doug Zongker and Android Git Automerger
80fb68181e
am 8347cb2d: revert to tacky 3D recovery animation
...
* commit '8347cb2d813b9a8b7c9165aadaea0b699eb5082f':
revert to tacky 3D recovery animation
2012-10-08 10:02:39 -07:00
Doug Zongker
8347cb2d81
revert to tacky 3D recovery animation
...
Bug: 7204420
Change-Id: I16d3346ce54b1aa5a0e6a02839ae9fbd4718fffa
2012-10-08 08:38:16 -07:00
The Android Open Source Project
6cc3ded278
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I887d27a16a0713ca92f3b2ebc570033cdb8759fb
2012-09-26 09:05:47 -07:00
The Android Automerger
6c73027700
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-25 06:59:14 -07:00
Doug Zongker and Android Git Automerger
a8db376401
am 6c8553dd: display error state on OTA failure
...
* commit '6c8553dda8b7fb45adc9f48a294c130b7e283f40':
display error state on OTA failure
2012-09-24 11:41:03 -07:00
Doug Zongker
6c8553dda8
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
2012-09-24 10:40:47 -07:00
The Android Open Source Project
15eaee40a1
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Ifa58ce936a9bf0a9e95f46eebcb4f64c772aa5ba
2012-09-20 10:34:51 -07:00
Doug Zongker and Android Git Automerger
42afb5457f
am b66cb69e: tweak recovery text images
...
* commit 'b66cb69e3933d5f56f06d88cd31817f49d87df5f':
tweak recovery text images
2012-09-18 16:54:44 -07:00
Doug Zongker and The Android Automerger
cda00bba51
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
2012-09-18 16:31:04 -07:00
Doug Zongker and The Android Automerger
ea6b2a7a85
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
2012-09-18 16:30:55 -07:00
Doug Zongker
b66cb69e39
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
2012-09-18 14:52:18 -07:00
Doug Zongker and Android Git Automerger
ed3bc11e7d
am 5fa8c239: localization for recovery messages
...
* commit '5fa8c23911759a9e81af0e7fb5eb431277b8e9a6':
localization for recovery messages
2012-09-18 13:48:31 -07:00
Doug Zongker
5fa8c23911
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
2012-09-18 12:37:02 -07:00
The Android Open Source Project
74a806e5ef
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Ia9cde557f8e6abaf0935e6b238eb956be09c12ca
2012-09-06 07:52:40 -07:00
The Android Automerger
f8be769488
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-05 06:33:23 -07:00
Doug Zongker
52eeea4fa5
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
2012-09-04 14:28:25 -07:00
Doug Zongker and The Android Automerger
276657839e
fix format of installing_text
...
Was submitted in the wrong PNG format (color type 4 instead of 0).
Change-Id: I8780c81eb92bdfc407b43948a92b37d93026325a
2012-08-30 15:48:19 -07:00
Doug Zongker
f4c6ec84c2
fix format of installing_text
...
Was submitted in the wrong PNG format (color type 4 instead of 0).
Change-Id: I8780c81eb92bdfc407b43948a92b37d93026325a
2012-08-30 12:47:43 -07:00
Doug Zongker and Android (Google) Code Review
aff4dbb0ae
Merge "recovery locale handling fixes" into jb-mr1-dev
2012-08-29 15:57:02 -07:00
Doug Zongker
8b240ccca1
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
2012-08-29 15:19:29 -07:00
Jean-Baptiste Queru and Android Git Automerger
d52ef348d5
am bddbb5b3: Merge "Fixing trivial warnings for libminui"
...
* commit 'bddbb5b370d925d6e5ae62d560f5e7ad09a6ffac':
Fixing trivial warnings for libminui
2012-08-24 13:06:43 -07:00
Jean-Baptiste Queru and android code review
bddbb5b370
Merge "Fixing trivial warnings for libminui"
2012-08-24 13:00:02 -07:00
Stephen Hines and Android (Google) Code Review
3474ab2888
Merge "Add libm due to libpng dependency." into jb-mr1-dev
2012-08-23 17:50:27 -07:00
Jean-Baptiste Queru and Android Git Automerger
e630d945f9
am 6a693d57: Merge "Fixed warnings in libmtdutils"
...
* commit '6a693d57687a18f8e032293b71ca98882a78c93d':
Fixed warnings in libmtdutils
2012-08-23 15:54:02 -07:00
Jean-Baptiste Queru and Android Git Automerger
8876725f05
am 0254d573: Merge "Fix multiple defined symbol errors"
...
* commit '0254d57367432069256b623c6852da8b92626e79':
Fix multiple defined symbol errors
2012-08-23 15:54:01 -07:00
Jean-Baptiste Queru and Android Git Automerger
7b827d04a5
am 481e03e3: Merge "Fixed unused param warnings for check-lost+found"
...
* commit '481e03e39810ba1b7eab1d0d806039f45c4ad987':
Fixed unused param warnings for check-lost+found
2012-08-23 15:54:01 -07:00
Stephen Hines
91eb721969
Add libm due to libpng dependency.
...
Change-Id: I0bdc2df5ef358813587f613a1b50eaa850e95782
2012-08-23 15:20:16 -07:00
Doug Zongker
4f33e55d1c
change recovery images to android with spinner
...
Also make writing the locale a bit more robust.
Change-Id: I803dd0aa0b9d6661fad74ea13fb085682402323c
2012-08-23 13:19:02 -07:00
Jean-Baptiste Queru and android code review
6a693d5768
Merge "Fixed warnings in libmtdutils"
2012-08-23 08:04:24 -07:00