Commit graph

445 commits

Author SHA1 Message Date
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
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
Doug Zongker
48704798ea run minadbd as shell user, remove unused code
Make minadbd drop its root privileges after initializing.  We need to
make the /tmp directory writable by the shell group so that it can
drop the sideloaded file there.
2012-03-20 10:50:23 -07:00
Doug Zongker
098d1f63c6 remove unused code from minadbd
Change-Id: I2f192c67ef425a53a1dba65d3e0544c1d5a567bd
2012-03-20 09:58:12 -07:00
Doug Zongker
703ed15214 run minadbd as shell user
Make minadbd drop its root privileges after initializing.  We need to
make the /tmp directory writable by the shell group so that it can
drop the sideloaded file there.

Change-Id: I67b292cf769383f0f67fb934e5a80d408a4c131d
2012-03-19 16:24:28 -07:00
Doug Zongker
35a35a6766 remove retouching code from updater
Removes the retouch_binaries and undo_retouch_binaries from updater;
newly generated OTA packages should not call them any more.

Note that applypatch retains the ability to unretouch a file as it
reads it.  This will be needed as long as we want to support OTAs from
devices that were installed with retouching.

Change-Id: Ib3f6baeae90c84ba85983f626d821ab7e436ceb2
2012-02-28 12:30:13 -08:00
Doug Zongker
b07b293944 fix build
Change-Id: I44a75f5451af053778be299b23274ecce9b2db76
2012-02-28 12:07:30 -08:00
Doug Zongker
1c43c9741b fix failure to free memory
The applypatch function is somewhat sloppy about freeing memory (since
it was originally a standalone binary).  Fix some of that.

Change-Id: Ifd44d71ea189c0b5115493119fd57bc37533fd59
2012-02-28 11:07:09 -08:00
The Android Open Source Project
53013c4645 am 62947db5: am 37d0f260: Reconcile with ics-mr1-release
* commit '62947db579fa7acc9ee01d71f3aeb30add3df260':
2012-02-01 10:03:13 -08:00
The Android Open Source Project
62947db579 am 37d0f260: Reconcile with ics-mr1-release
* commit '37d0f260a55cfbe2b275131b12b2b5b824955e51':
2012-02-01 10:00:24 -08:00
The Android Open Source Project
37d0f260a5 Reconcile with ics-mr1-release
Change-Id: Id3629feac35e35922942a6d04e741e72b95fded4
2012-02-01 08:49:25 -08:00