Commit Graph

492 Commits

Author SHA1 Message Date
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
Doug Zongker
ae0655b407 am f4c6ec84: fix format of installing_text
* commit 'f4c6ec84c24611856374353bdef87baca5694cc0':
  fix format of installing_text
2012-08-30 13:33:58 -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
a0ba2d3a62 am aff4dbb0: Merge "recovery locale handling fixes" into jb-mr1-dev
* commit 'aff4dbb0ae33e55785d1a11f93c1e20ebfed4a90':
  recovery locale handling fixes
2012-08-29 16:01:47 -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
b5f4261a22 am d52ef348: am bddbb5b3: Merge "Fixing trivial warnings for libminui"
* commit 'd52ef348d5abb65cd067be334d37c86d621786b9':
  Fixing trivial warnings for libminui
2012-08-24 14:19:19 -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
51aa144d26 am 3474ab28: Merge "Add libm due to libpng dependency." into jb-mr1-dev
* commit '3474ab2888838e512c6bcff588fa88f02c81135f':
  Add libm due to libpng dependency.
2012-08-23 17:53:40 -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
9383c8cb0b am e630d945: am 6a693d57: Merge "Fixed warnings in libmtdutils"
* commit 'e630d945f90a3a5610529b761ea9638929949a2e':
  Fixed warnings in libmtdutils
2012-08-23 15:59:38 -07:00
Jean-Baptiste Queru
d863682672 am 8876725f: am 0254d573: Merge "Fix multiple defined symbol errors"
* commit '8876725f05518e8170aedb81ab40dfe638eb656f':
  Fix multiple defined symbol errors
2012-08-23 15:59:37 -07:00
Jean-Baptiste Queru
b07faf8f1a am 7b827d04: am 481e03e3: Merge "Fixed unused param warnings for check-lost+found"
* commit '7b827d04a5cab7d8c5573181de3eb4ea2d0e173a':
  Fixed unused param warnings for check-lost+found
2012-08-23 15:59:36 -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
cf9f4e0020 am 4f33e55d: change recovery images to android with spinner
* commit '4f33e55d1c38d2f72f3306a82c177850f3676408':
  change recovery images to android with spinner
2012-08-23 13:24:36 -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
Doug Zongker
ec5eceb849 am 02ec6b88: add simple text to recovery UI
* commit '02ec6b88ed4e6cf40cc257572b07c7277b7b6341':
  add simple text to recovery UI
2012-08-23 13:14:14 -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
13a29ea968 am a3ccba6d: add bonus data feature to imgdiff/imgpatch/applypatch
* commit 'a3ccba6d314cb29b02d1dbda9a71427b11da936d':
  add bonus data feature to imgdiff/imgpatch/applypatch
2012-08-20 15:50:19 -07: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
b8ae4f8e20 am 55850258: am 3733d218: Merge changes I664f8dc7,I4154db06,I5e1df90f
* commit '5585025814418e8b692a3a38b7cff495180a74f8':
  recovery: import init.recovery.${ro.hardware}.rc
  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:18:23 -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
Joe Onorato
e709c24f27 Use the static version of libsparse
Change-Id: I664f8dc7939f8f902e4775eaaf6476fcd4ab8ed2
2012-08-14 12:52:53 -07:00
Joe Onorato
f47ae6a4d9 Multiple modules with the same name are going away.
Change-Id: I4154db066865d6031caa3c2c3b94064b2f28076e
2012-08-14 12:52:53 -07:00
Joe Onorato
fc417fc4c4 host modules don't need LOCAL_MODULE_TAGS
Change-Id: I5e1df90f18fbaf98e3207c553a8fb859c1064137
2012-08-14 12:52:53 -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
Doug Zongker
aade2e590e am dd6cd4fc: Merge "graphics: add support for "single buffering""
* commit 'dd6cd4fcc1b22df7f55e1ab3e54589939dc54179':
  graphics: add support for "single buffering"
2012-07-20 22:35:27 -07:00