summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix vulnerability in bspatchDoug Zongker2014-05-131-0/+5
| | | | | | | | Patches with control data tuples with negative numbers in the first and/or second can cause bspatch to write to arbitrary locations in the heap. Change-Id: I8c5d81948be773e6483241131d3d166b6da27cb8
* Merge "recovery: minui: add adf backend"Greg Hackmann2014-05-025-5/+267
|\
| * recovery: minui: add adf backendGreg Hackmann2014-04-255-5/+267
|/ | | | | Change-Id: I1ad97b5b62bddbcb1104fa0b4e54415b793a4194 Signed-off-by: Greg Hackmann <ghackmann@google.com>
* Merge "Change filesystem add entry API call."Sasha Levitskiy2014-04-111-1/+1
|\
| * Change filesystem add entry API call.Sasha Levitskiy2014-04-111-1/+1
|/ | | | | | Needs fs_mgr matching change from: Icf23e659265d71d5226d527c2b40cfbc132320ee Change-Id: I9adb470b04e4301989d128c9c3097b21b4dea431 Signed-off-by: Sasha Levitskiy <sanek@google.com>
* Merge "restore minui support for paletted images with < 8 bits"Doug Zongker2014-03-201-1/+1
|\
| * restore minui support for paletted images with < 8 bitsDoug Zongker2014-03-201-1/+1
|/ | | | | | | The PNG image loaders should support images that use palettes requiring fewer than 8 bits. Change-Id: Ibcb0ff6f04aea8de54b03c0efa7a79e9b3635146
* Merge "add --shutdown_after option to recovery"Doug Zongker2014-03-181-4/+10
|\
| * add --shutdown_after option to recoveryDoug Zongker2014-03-181-4/+10
|/ | | | | | | | | | The "--shutdown_after" option causes recovery to power down the device on completion rather than rebooting. Removes the last vestiges of the "--previous_runs" argument, which doesn't seem to be used for anything. Change-Id: I465eda2ef59d367e2b1c79a8dc69831263c69a4d
* Merge "fix error log statement"Doug Zongker2014-03-171-1/+1
|\
| * fix error log statementDoug Zongker2014-03-171-1/+1
|/ | | | | | We were printing the address of channels instead of the value there. Change-Id: I652340c7c1a0abaf01af555e54d2c0366d21ad78
* Merge "refactor image resource loading code in minui"Doug Zongker2014-03-176-244/+253
|\
| * refactor image resource loading code in minuiDoug Zongker2014-03-176-244/+253
|/ | | | | | | | | | Reduce the number of copies of libpng boilerplate. Rename res_create_* functions to be more clear. Make explicit the use of the framebuffer pixel format for images, and handle more combinations of input and output (eg, loading a grayscale image for display rather than use as a text alpha channel). Change-Id: I3d41c800a8f4c22b2f0167967ce6ee4d6b2b8846
* Merge "Recovery 64-bit compile issues"Mark Salyzyn2014-03-1411-30/+33
|\
| * Recovery 64-bit compile issuesMark Salyzyn2014-03-1411-30/+33
|/ | | | Change-Id: I92d5abd1a628feab3b0246924fab7f97ba3b9d34
* Merge "separate fbdev-specific code out from minui"Doug Zongker2014-03-115-152/+268
|\
| * separate fbdev-specific code out from minuiDoug Zongker2014-03-115-152/+268
|/ | | | | | | Isolate the code that interacts with fbdev, in preparation for adding a new backend. Change-Id: I19105e9da1ca6408cebc110f7e2bb5abfb481ee9
* Merge "remove pixelflinger from recovery"Doug Zongker2014-03-116-274/+358
|\
| * remove pixelflinger from recoveryDoug Zongker2014-03-116-274/+358
|/ | | | | | | | | | | | | | | | | | | Recovery now draws directly to the framebuffer by rolling its own graphics code, rather than depending on libpixelflinger. The recovery UI is modified slightly to eliminate operations that are slow with the software implementation: when the text display / menu is turned on, it now appears on a black background instead of a dimmed version of the recovery icon. There's probably substantial room for optimization of the graphics operations. Bug: 12131110 Change-Id: Iab6520e0a7aaec39e2ce39377c10aef82ae0c595 Conflicts: minui/resources.c
* Merge "update tools for making recovery images"Doug Zongker2014-03-112-102/+53
|\
| * update tools for making recovery imagesDoug Zongker2014-03-112-102/+53
|/ | | | | | | | | | | We no longer render animations as a base image with a possibly-partially-transparent overlay drawn over it, so delete the make-overlay.py tool. Now we represent them as series of images that are interlaced by row (with a special text chunk in the PNG file specifying the number of frames) so add the interlace-frames.py tool to make those. Change-Id: I866db269107a21351c3df3b4683f233f72234334
* Merge "allow CheckKey to request mounting /system"Doug Zongker2014-03-113-3/+52
|\
| * allow CheckKey to request mounting /systemDoug Zongker2014-03-113-3/+52
|/ | | | | | | Also provide a default implementation of CheckKey that's reasonable for many devices (those that have power and volume keys). Change-Id: Icf6c7746ebd866152d402059dbd27fd16bd51ff8
* Merge "change how recovery animation is implemented"Doug Zongker2014-03-1118-95/+203
|\
| * change how recovery animation is implementedDoug Zongker2014-03-1118-95/+203
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of one 'base' installing image and a number of overlay images that are drawn on top of it, we represent the installing animation with one PNG that contains all the animation frames, interlaced by row. The PNG is expected to have a text chunk with the keyword 'Frames' and a value that's the number of frames (as an ascii string). This representation provides better compression, removes the need to subclass ScreenRecoveryUI just to change the position of the overlay or number of frames, and doesn't require gr_blit() to support an alpha channel. We also remove the 'indeterminate' progress bar used when wiping data and/or cache. The main animation serves the same purpose (showing that the device is still alive); the spinning progress bar has been redundant for a while. This changes the default recovery animation to include the antenna-wiggling and gear-turning that's used in the Nexus 5 recovery animation. Change-Id: I51930a76035ac09969a25472f4e572b289418729 Conflicts: screen_ui.cpp screen_ui.h
* Merge "ADB sideload command not work"Doug Zongker2014-02-263-11/+358
|\
| * ADB sideload command not workDa Zhou2014-01-173-11/+358
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In kernel(3.10) USB ADB gadget driver is removed. Using Functionfs for USB adb gadget. Android recovery uses a stripped down version of adb command for sideload only. It's missing the ffs function support, so add the ffs support to allow sideload command to work b/12608946 Change-Id: I4ad024723dfc5bdb544548391f99637c390b171e Signed-off-by: Pierre Couillaud <pierre@broadcom.com>
* | Merge "recovery: Fix adb with linux 3.10"Benoit Goby2014-02-201-0/+6
|\ \
| * | recovery: Fix adb with linux 3.10Benoit Goby2014-02-191-0/+6
|/ / | | | | | | | | | | | | | | In kernel 3.10, f_adb has been removed and adbd can use functionfs instead. Mount functionfs on boot for adbd. On older kernels, mount will fail silently and adbd will revert to f_adb. Change-Id: I5db57aaf35b35859ea88c7d0e0661d8c553e5811
* | Merge "recovery: fix building with pointer-to-int errors turned on"Colin Cross2014-02-063-5/+5
|\ \
| * | recovery: fix building with pointer-to-int errors turned onColin Cross2014-02-053-5/+5
|/ / | | | | | | | | | | | | | | | | | | Use intptr_t/uintptr_t to cast between pointer and int to allow building with -Werror=pointer-to-int-cast and Werror=int-to-pointer-cast turned on. Cast to char* instead of unsigned int for pointer arithmetic. Change-Id: Ia862306fdcca53866b330e8cf726f3d62f2248a0
* | Merge "minadbd: remove dead code"Colin Cross2014-01-272-25/+0
|\ \
| * | minadbd: remove dead codeColin Cross2014-01-242-25/+0
|/ / | | | | | | Change-Id: Ia1f34a17ae582575f8cd3514ed7bc015b0a5006e
* | Merge "adbd: switch to su domain when running as root"Nick Kralevich2014-01-241-1/+1
|\ \ | |/ |/|
| * adbd: switch to su domain when running as rootNick Kralevich2014-01-181-1/+1
|/ | | | | | | | | | | When adbd runs as root, it should transition into the su domain. This is needed to run the adbd and shell domains in enforcing on userdebug / eng devices without breaking developer workflows. Use the new device_banner command line option. Change-Id: Ib33c0dd2dd6172035230514ac84fcaed2ecf44d6
* Merge "correctly mount tmpfs as /tmp in recovery"Doug Zongker2014-01-141-2/+2
|\
| * correctly mount tmpfs as /tmp in recoveryDoug Zongker2014-01-141-2/+2
|/ | | | | | | | | | | The syntax of init's mount command changed in April 2008 but recovery's init.rc was never updated, so recovery's /tmp has been on the root fs all this time. Fix. Also add /system/bin to the PATH in recovery, which is handy for debugging. Change-Id: I39f7ae435a8ce3bad691e4b7c307db0bd8de1302
* Merge "Set SELinux security contexts correctly for init and services."Nick Kralevich2014-01-131-0/+11
|\
| * Set SELinux security contexts correctly for init and services.Stephen Smalley2014-01-131-0/+11
|/ | | | | | | | Otherwise everything is left running in the kernel domain when booting recovery. Change-Id: Ie3d86547d5be0b68dd1875a97afe1e00fc3e4da1 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* Merge "minui: do not use flexible array initialization"Nick Kralevich2014-01-041-1/+1
|\
| * minui: do not use flexible array initializationsynergy dev2013-11-261-1/+1
| | | | | | | | | | | | Avoiding the use of gnu extensions improves code portability Change-Id: I441a49ce08b6ecb1d735ca453552fa92026c5016
* | am c64e76c7: Merge "Enable incremental builder to find files that moved, and ↵Michael Runge2013-11-071-0/+35
|\ \ | |/ |/| | | | | | | | | try to process them via patch + rename, instead of delete + add." into klp-dev * commit 'c64e76c75088b951f61a7f7bacf8af6eccd2ccfa': Enable incremental builder to find files that moved, and try to process them via patch + rename, instead of delete + add.
| * Merge "Enable incremental builder to find files that moved, and try to ↵Michael Runge2013-11-071-0/+35
| |\ | | | | | | | | | process them via patch + rename, instead of delete + add." into klp-dev
| | * Enable incremental builder to find files that moved, andMichael Runge2013-11-071-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | try to process them via patch + rename, instead of delete + add. b/11437930 Change-Id: I984349fbc9a8dac4379e00c0d66fc7d22c4eb834
* | | am 3966c571: merge in klp-release (no-op)Ed Heyl2013-10-160-0/+0
|\ \ \ | |/ / | | | | | | * commit '3966c571a0c36a40a8142e70b1aa6de547ea6ec3':
| * | merge in klp-release (no-op)Ed Heyl2013-10-160-0/+0
| |\ \ | | |/ | |/|
| | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-030-0/+0
| | |\
* | | \ am f4a6ab27: Merge "Add support for ECDSA signatures"Kenny Root2013-10-1412-60/+822
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * commit 'f4a6ab27b335b69fbc419a9c1ef263004b561265': Add support for ECDSA signatures
| * \ \ \ Merge "Add support for ECDSA signatures"Kenny Root2013-10-1412-60/+822
| |\ \ \ \
| | * | | | Add support for ECDSA signaturesKenny Root2013-10-1012-60/+822
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds support for key version 5 which is an EC key using the NIST P-256 curve parameters. OTAs may be signed with these keys using the ECDSA signature algorithm with SHA-256. Change-Id: Id88672a3deb70681c78d5ea0d739e10f839e4567
generated by cgit v1.1 at 2024-12-23 10:21:44 +0000