Commit Graph

493 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
bddbb5b370 Merge "Fixing trivial warnings for libminui" 2012-08-24 13:00:02 -07:00
Stephen Hines
3474ab2888 Merge "Add libm due to libpng dependency." into jb-mr1-dev 2012-08-23 17:50:27 -07:00
Jean-Baptiste Queru
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
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
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
6a693d5768 Merge "Fixed warnings in libmtdutils" 2012-08-23 08:04:24 -07:00
Jean-Baptiste Queru
0254d57367 Merge "Fix multiple defined symbol errors" 2012-08-23 08:04:04 -07:00
Jean-Baptiste Queru
481e03e398 Merge "Fixed unused param warnings for check-lost+found" 2012-08-23 08:03:52 -07:00
Doug Zongker
02ec6b88ed 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
2012-08-22 17:26:40 -07:00
Edwin Vane
edc5d17096 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>
2012-08-21 16:04:43 -04:00
Edwin Vane
0298ec21d2 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>
2012-08-21 16:04:21 -04:00
Edwin Vane
4f66d550e9 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>
2012-08-21 16:03:46 -04:00
Edwin Vane
76b6666f24 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>
2012-08-21 16:03:11 -04:00
Doug Zongker
a3ccba6d31 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
2012-08-20 15:28:02 -07:00
Joe Onorato
5585025814 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
2012-08-17 00:11:55 -07:00
Joe Onorato
3733d2185b 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
2012-08-16 23:40:26 -07:00
Colin Cross
f510f069fd 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
2012-08-08 13:06:26 -07:00
Doug Zongker
a23075fb0e 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
2012-08-06 16:35:18 -07:00
Ed Heyl
64c5a59be9 fix conflicts with merge of jb-dev-mako
Change-Id: I2d8d18232ed02b2c4e3e661544046bf4b8039800
2012-07-26 13:57:07 -07:00
Doug Zongker
17495277b1 support version 2 (2048-bit e=65537) keys in recovery
Change-Id: I9849c69777d513bb12926c8c622d1c12d2da568a
2012-07-25 13:10:58 -07:00
Joe Onorato
4eeb379886 Use the static version of libsparse
Change-Id: I664f8dc7939f8f902e4775eaaf6476fcd4ab8ed2
2012-07-23 19:14:30 -07:00
Joe Onorato
6396e70d3f Multiple modules with the same name are going away.
Change-Id: I4154db066865d6031caa3c2c3b94064b2f28076e
2012-07-21 15:41:15 -07:00
Joe Onorato
c0481af406 host modules don't need LOCAL_MODULE_TAGS
Change-Id: I5e1df90f18fbaf98e3207c553a8fb859c1064137
2012-07-21 15:24:56 -07:00