Commit graph

454 commits

Author SHA1 Message Date
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
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
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
Doug Zongker
dd6cd4fcc1 Merge "graphics: add support for "single buffering"" 2012-07-20 15:04:08 -07:00
Devin Kim
862d026fb2 minui: fix screen update issue
yres_virtual value is set incorrectly, causing serveral images to be skipped.
Change this value according to the number of buffers to fix this issue.

from: codeaurora.org
minui: Display the battery charging image correctly
commit: 581a4dead6b96579a13ff22e2454c1f329731679

Change-Id: I10f5d1c6cc37705f0287c7dd517082de2e11d264
Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-07-20 07:01:11 -07:00
Colin Cross
ee57854b7e am 989a2859: Merge "Link against libsparse"
* commit '989a28599a600b649f71a06335bf1e4085b5505a':
  Link against libsparse
2012-07-17 23:17:52 -07:00
Colin Cross
989a28599a Merge "Link against libsparse" 2012-07-17 18:32:28 -07:00
Colin Cross
cde94f309c Link against libsparse
libext4_utils requires libsparse, link against it as well.

Change-Id: I4d6aec0e5edcf1ed42118b7b77adcded2858d3dd
2012-07-17 17:59:47 -07:00
Octavian Purdila
0e34880ca2 graphics: add support for "single buffering"
When we don't have enough video memory for double buffering we
fallback to "single buffering".

Change-Id: I8bfab6d8cd6b54f0cc6c67edc41a4c37d8fbd4ba
Signed-off-by: Octavian Purdila <octavian.purdila@intel.com>
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2012-07-11 15:32:11 -07:00
Doug Zongker
9c5efe6bde allow double-quotes or not in TARGET_RECOVERY_PIXEL_FORMAT
Change-Id: I0bf22c87c51a34ee4a839c4966277fad8150bd59
2012-07-11 13:21:02 -07:00
Nick Kralevich
956cde8578 Add mode when open(O_CREAT) is used.
When creating a new file using open(..., O_CREAT), it is an error
to fail to specify a creation mode. If a mode is not specified, a
random stack provided value is used as the "mode".

This will become a compile error in a future Android change.

Change-Id: I73c1e1a39ca36bf01704b07302af4971d234b5a8
2012-06-26 15:01:03 -07:00
Ying Wang
ea17e320b0 am 6d60667d: Merge "Use a dependency file to replace the list file."
* commit '6d60667de6b8e6bd8a54fb4031901e2935743308':
  Use a dependency file to replace the list file.
2012-06-11 16:30:26 -07:00
Ying Wang
6d60667de6 Merge "Use a dependency file to replace the list file." 2012-06-11 15:32:52 -07:00
Ying Wang
eef790de66 Use a dependency file to replace the list file.
instead of creating the list file whenever loading the Android.mk

Change-Id: I78e4820754399dff3993a863eede8b75da9f6d29
2012-06-11 14:53:08 -07:00
The Android Open Source Project
5f4eeec23c Reconcile with jb-release nakasi-factoryrom-release
Change-Id: I66ce5e9ca22d4aecb694bf8814fbf3404fb0013b
2012-05-16 08:39:57 -07:00
The Android Automerger
0c0efa0285 merge in jb-release history after reset to jb-dev 2012-04-30 06:59:27 -07:00
Doug Zongker
69f4b6732c fix timed progress bars in recovery
They're completely broken and have been for months because this code
makes no sense.

Change-Id: Ibabcd3dbe5a004a45b341e4a5215aa3df77e1861
2012-04-26 14:37:53 -07:00
The Android Automerger
42b7340563 merge in jb-release history after reset to master 2012-04-16 06:59:28 -07:00
Doug Zongker
f69d40afa1 am e5d5ac76: minor recovery changes
* commit 'e5d5ac76cc8e5d11867aeff6a1d068215c1c3a7c':
  minor recovery changes
2012-04-12 12:55:53 -07:00
Doug Zongker
e5d5ac76cc minor recovery changes
- add the --just_exit option to make recovery exit normally without doing anything
- make it possible to build updater extensions in C++
- add the clear_display command so that the updater binary can request
  recovery switch to the NONE background UI

These are all used to support the notion of using OTA as a factory
reflash mechanism.

Change-Id: Ib00d1cbf540feff38f52a61a2cf198915b48488c
2012-04-12 11:01:22 -07:00
The Android Automerger
25bb2a3d74 merge in jb-release history after reset to master 2012-04-10 06:59:28 -07:00
Doug Zongker
c686a39715 Merge "Add NOTICE file" 2012-04-09 11:04:46 -07:00
The Android Automerger
8619a78214 merge in jb-release history after reset to master 2012-04-09 06:59:26 -07:00
Kenny Root
038818cb63 Update merge for SELinux to compile
The contribution of SELinux things to AOSP had a call to the old
ui_print that merged cleanly. This changes that call into the newer
call so it will actually compile when enabled.

Change-Id: I8368e937219b01d0bef06007fa46302415256d07
2012-04-08 11:03:04 -07:00
Kenny Root
1e4469a786 am 78911bdf: am 2a4ab824: Merge "Change the format command to always take the mount point as an argument."
* commit '78911bdf4f9dfff6583f3f8150a3257212ceea13':
  Change the format command to always take the mount point as an argument.
2012-04-06 18:05:56 -07:00
Kenny Root
78911bdf4f am 2a4ab824: Merge "Change the format command to always take the mount point as an argument."
* commit '2a4ab824b39e429969199c189ae1b6c1115e51d5':
  Change the format command to always take the mount point as an argument.
2012-04-06 18:03:49 -07:00
Kenny Root
2a4ab824b3 Merge "Change the format command to always take the mount point as an argument." 2012-04-06 14:42:27 -07:00
Wei Zhong
6e960cd221 Add NOTICE file
1. AOSP_APACH2
2. BSD for bsdiff.c and bspatch.c

Bug: 6299628

Change-Id: If9a5f7f8f07ad51bb62202253da189d804674e54
Signed-off-by: Wei Zhong <wzhong@google.com>
(cherry picked from commit 592e7a9cf1c856bee2adb8f285ac359e2d7f68e1)
2012-04-06 13:51:00 -07:00
Mike Lockwood
345544c924 Merge remote-tracking branch 'goog/ics-aah' 2012-04-03 11:20:55 -07:00
Stephen Smalley
516e4e2372 Change the format command to always take the mount point as an argument.
Requires I5a63fd61a7e74d386d0803946d06bcf2fa8a857e

Change-Id: Ica5fb73d6f2ffb981b74d1896538988dbc4d9b24
2012-04-03 13:35:11 -04:00
The Android Automerger
bc05cb893a merge in jb-release history after reset to master 2012-04-02 06:59:32 -07:00
Kenny Root
41dda82d84 resolved conflicts for merge of 0b1fee1b to master
Change-Id: I2e8298ff5988a96754f56f80a5186c9605ad9928
2012-03-30 21:26:01 -07:00
Kenny Root
0b1fee1b2a am 155cd3c1: Merge changes Ied379f26,I09fb9d56
* commit '155cd3c155004433215147437cdf71844c9efd87':
  Extend recovery and updater to support setting file security contexts.
  Add libselinux to LOCAL_STATIC_LIBRARIES wherever libext4_utils is used.
2012-03-30 15:53:17 -07:00
Kenny Root
155cd3c155 Merge changes Ied379f26,I09fb9d56
* changes:
  Extend recovery and updater to support setting file security contexts.
  Add libselinux to LOCAL_STATIC_LIBRARIES wherever libext4_utils is used.
2012-03-30 15:18:11 -07:00
Stephen Smalley
779701db51 Extend recovery and updater to support setting file security contexts.
Extend minzip, recovery, and updater to set the security context on
files based on the file_contexts configuration included in the package.

Change-Id: Ied379f266a16c64f2b4dca15dc39b98fcce16f29
2012-03-30 09:32:46 -04:00
The Android Automerger
9d3b75603b merge in jb-release history after reset to master 2012-03-26 06:59:36 -07:00
Doug Zongker
b2364342a0 Merge "fail edify script if set_perm() or symlink() fails" 2012-03-22 14:48:59 -07:00
Doug Zongker
acd73ed156 fail edify script if set_perm() or symlink() fails
It's surprising if these fail, so abort the whole edify script to
catch any problems early.

Bug: 2284848
Change-Id: Ia2a0b60e7f086fc590b242616028905a229c9e05
2012-03-22 14:33:53 -07:00
Mike Lockwood
19021a77ec Merge remote-tracking branch 'goog/ics-aah-exp' 2012-03-21 15:11:56 -07:00
The Android Automerger
cc8d28efa4 merge in jb-release history after reset to master 2012-03-21 06:59:51 -07:00
The Android Automerger
ba5e5474f3 merge in jb-release history after reset to master 2012-03-20 14:12:24 -07:00