Commit graph

636 commits

Author SHA1 Message Date
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
Doug Zongker
bf80f49edc 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
2012-10-19 12:24:26 -07:00
Kenny Root
a0d9ddb8f2 am cd74108c: resolved conflicts for merge of 78afed1c to jb-mr1-dev-plus-aosp
* commit 'cd74108cdac228e946ca8b6ea2ff11ab62941a6d':
  Remove HAVE_SELINUX guards
2012-10-16 17:49:23 -07: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
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
2b44a56326 am d0d4d44d: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit 'd0d4d44d344779e59ee196637bbc745d68d70677':
2012-10-10 09:45:39 -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
44df5c8692 am 4b57f8f2: am 6016d08b: recovery: fix failure to unmount "/cache"
* commit '4b57f8f2affade295ec856e2bc63ba02e9f079c4':
  recovery: fix failure to unmount "/cache"
2012-10-09 21:20:58 -07:00
Devin Kim
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
3abfe0911e am 2c3d1d83: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '2c3d1d83d5f28160baa5cbec782d518fa186af73':
2012-10-09 07:29:50 -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
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
2e883a8deb am 80fb6818: am 8347cb2d: revert to tacky 3D recovery animation
* commit '80fb68181e2a396de97c3d1b2d7c9e736cec4417':
  revert to tacky 3D recovery animation
2012-10-08 10:57:16 -07:00
Doug Zongker
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
92b466f883 am 6cc3ded2: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '6cc3ded278818e2897459bdfdc5a5fb4b9ef3071':
2012-09-26 10:07:44 -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
4e0c8cc8df am a8db3764: am 6c8553dd: display error state on OTA failure
* commit 'a8db3764010310045f63bf8da860a9529b948133':
  display error state on OTA failure
2012-09-24 11:42:20 -07:00
Doug Zongker
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
62831de1be am 15eaee40: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '15eaee40a19c0d7391b5f209e4336e889be43297':
  tweak recovery text images
  localization for recovery messages
2012-09-20 12:48:50 -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
f8084b400d am 42afb545: am b66cb69e: tweak recovery text images
* commit '42afb5457f75cffb29a6d658fbf17961210080fd':
  tweak recovery text images
2012-09-18 17:16:19 -07:00
Doug Zongker
42afb5457f am b66cb69e: tweak recovery text images
* commit 'b66cb69e3933d5f56f06d88cd31817f49d87df5f':
  tweak recovery text images
2012-09-18 16:54:44 -07:00
Doug Zongker
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
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
c099f2d938 am ed3bc11e: am 5fa8c239: localization for recovery messages
* commit 'ed3bc11e7dd4b6e0ddb77a3c9492675d8ac6855d':
  localization for recovery messages
2012-09-18 13:57:07 -07:00
Doug Zongker
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
7ae6e20201 am 74a806e5: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '74a806e5efbfd4a37725f2f1e193c3c2eb973fb7':
  fix format of installing_text
2012-09-06 09:12:01 -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
4ce9540814 am 52eeea4f: minor recovery fixes
* commit '52eeea4fa59c15ecb09c32b8e05653f4e55f5188':
  minor recovery fixes
2012-09-04 17:02:39 -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
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