summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove UniquePtr.h copyKenny Root2013-09-201-239/+0
| | | | | | | | | | This was copied from libcore/include quite a while ago, but the canonical version has since moved out to a generic library called libnativehelper. All users of this header should already have libnativehelper on their include path, so switching to the canonical version is as easy as removing the "utils/" part. Change-Id: Iae8e59bf3eee573bfa78381866989934e5bbf19d
* Merge "Remove a homebrew mmap64."Elliott Hughes2013-09-201-9/+0
|\
| * Remove a homebrew mmap64.Elliott Hughes2013-09-201-9/+0
| | | | | | | | | | | | This should have been fixed in bionic, and now has been. Change-Id: Ib9b21771ed7fbb6b4082b52d0b590f2867f344d4
* | am 4d5d633b: am 20eb7ac2: am 3c8bdef0: Merge "libsparse: Use BIONIC ↵Elliott Hughes2013-09-201-9/+0
|\ \ | | | | | | | | | | | | | | | | | | implementation of mmap64()" * commit '4d5d633bf862dbb0a960019e80fadc40c93177f0': libsparse: Use BIONIC implementation of mmap64()
| * \ am 20eb7ac2: am 3c8bdef0: Merge "libsparse: Use BIONIC implementation of ↵Elliott Hughes2013-09-191-9/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | mmap64()" * commit '20eb7ac26435abb1b2514951eee07fee44773877': libsparse: Use BIONIC implementation of mmap64()
| | * \ am 3c8bdef0: Merge "libsparse: Use BIONIC implementation of mmap64()"Elliott Hughes2013-09-191-9/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit '3c8bdef029cbaa8d8fa18e4e55e51b60e938dd6e': libsparse: Use BIONIC implementation of mmap64()
| | | * \ Merge "libsparse: Use BIONIC implementation of mmap64()"Elliott Hughes2013-09-191-9/+0
| | | |\ \
| | | | * | libsparse: Use BIONIC implementation of mmap64()Daniel Leung2013-09-181-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I63692629d3a62b7aee21202b67241904b1cc9789 Signed-off-by: Daniel Leung <daniel.leung@intel.com>
* | | | | | Merge "Add append2simg."Geremy Condra2013-09-192-2/+114
|\ \ \ \ \ \
| * | | | | | Add append2simg.Geremy Condra2013-08-062-2/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Append2simg is a small utility designed to glue data to the end of a sparse image. Beware that it doesn't do anything clever with that data. Change-Id: I33af330cb4f77e0842375797a35aebbb6af60163
* | | | | | | am 1998e505: am 2e940286: am 0f507339: Merge "Do not change ownership of ↵Nick Kralevich2013-09-191-1/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /sys/fs/selinux/load to system UID." * commit '1998e505a98ad445bead87c2bb047053f1aea648': Do not change ownership of /sys/fs/selinux/load to system UID.
| * | | | | | am 2e940286: am 0f507339: Merge "Do not change ownership of ↵Nick Kralevich2013-09-191-1/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /sys/fs/selinux/load to system UID." * commit '2e9402863b40fe8bf2ddd8169c62f2419d968ff9': Do not change ownership of /sys/fs/selinux/load to system UID.
| | * | | | | am 0f507339: Merge "Do not change ownership of /sys/fs/selinux/load to ↵Nick Kralevich2013-09-191-1/+0
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | system UID." * commit '0f507339ec474a2f67227466efc9045630f1f1a4': Do not change ownership of /sys/fs/selinux/load to system UID.
| | | * | | | Merge "Do not change ownership of /sys/fs/selinux/load to system UID."Nick Kralevich2013-09-191-1/+0
| | | |\ \ \ \
| | | | * | | | Do not change ownership of /sys/fs/selinux/load to system UID.Stephen Smalley2013-09-191-1/+0
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Policy reload is handled by setting the selinux.reload_policy property and letting the init process perform the actual loading of policy into the kernel. Thus, there should be no need for the system UID to directly write to /sys/fs/selinux/load. Change-Id: I240c5bb2deaee757a2e1e396e14dea9e5d9286f5 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* | | | | | | am a2a93250: am c67bd8d7: am a208ea63: Merge "Fix fstab memory leak"Elliott Hughes2013-09-181-2/+4
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'a2a93250f625b776886d3c5d41599abdaddb2e50': Fix fstab memory leak
| * | | | | | am c67bd8d7: am a208ea63: Merge "Fix fstab memory leak"Elliott Hughes2013-09-181-2/+4
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'c67bd8d7cd9b43a5a5ef249ea787ac9786359d22': Fix fstab memory leak
| | * | | | | am a208ea63: Merge "Fix fstab memory leak"Elliott Hughes2013-09-181-2/+4
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit 'a208ea6301b3a7141f800d21407b0befa8ad0a56': Fix fstab memory leak
| | | * | | | Merge "Fix fstab memory leak"Elliott Hughes2013-09-181-2/+4
| | | |\ \ \ \
| | | | * | | | Fix fstab memory leakIrina Tirdea2013-09-181-2/+4
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When reading the fstab config file fails, fstab memory is not freed. When fstab structure is no longer needed, only half of it is freed. Free fstab memory in all cases (error or when it is no longer needed). Change-Id: Ib0758a5aaa69505285bf64143632986a2dbbdccb Signed-off-by: Irina Tirdea <irina.tirdea@intel.com>
* | | | | | | am 9f25b565: am c4295d9b: am 810ff696: Merge "Cleanup fs_getline from fs_mgr"Elliott Hughes2013-09-181-72/+16
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '9f25b565f716d865597dd24761137a93f08d4bb1': Cleanup fs_getline from fs_mgr
| * | | | | | am c4295d9b: am 810ff696: Merge "Cleanup fs_getline from fs_mgr"Elliott Hughes2013-09-181-72/+16
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'c4295d9b72812afbaebd7f2512c7a5bba9e7d5fa': Cleanup fs_getline from fs_mgr
| | * | | | | am 810ff696: Merge "Cleanup fs_getline from fs_mgr"Elliott Hughes2013-09-181-72/+16
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit '810ff69609c6f6e0a562c8f05912d4d785fd8bd2': Cleanup fs_getline from fs_mgr
| | | * | | | Merge "Cleanup fs_getline from fs_mgr"Elliott Hughes2013-09-181-72/+16
| | | |\ \ \ \
| | | | * | | | Cleanup fs_getline from fs_mgrIrina Tirdea2013-09-181-72/+16
| | | | | |/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since getline is included in bionic, fs_mgr can use this version instead of the one defined internally by fs_getline. Replace fs_getline with getline. Change-Id: I49b53d639bd995f051256fb7573ff6ab45d9c36d Signed-off-by: Irina Tirdea <irina.tirdea@intel.com>
* | | | | | | am 54aad026: am 8dc82eea: am 36b39a97: Merge "init: Fix get_hardware_name() ↵Colin Cross2013-09-181-6/+30
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to cope with long /proc/cpuinfo output" * commit '54aad026616148164ff6ceda7508a4e5a04ec569': init: Fix get_hardware_name() to cope with long /proc/cpuinfo output
| * | | | | | am 8dc82eea: am 36b39a97: Merge "init: Fix get_hardware_name() to cope with ↵Colin Cross2013-09-181-6/+30
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | long /proc/cpuinfo output" * commit '8dc82eea7ebda374830ee7fa1802222a94eefd88': init: Fix get_hardware_name() to cope with long /proc/cpuinfo output
| | * | | | | am 36b39a97: Merge "init: Fix get_hardware_name() to cope with long ↵Colin Cross2013-09-181-6/+30
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /proc/cpuinfo output" * commit '36b39a97f3fc5790538e2e69429043b78ba486e4': init: Fix get_hardware_name() to cope with long /proc/cpuinfo output
| | | * | | | Merge "init: Fix get_hardware_name() to cope with long /proc/cpuinfo output"Colin Cross2013-09-181-6/+30
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | | * | | init: Fix get_hardware_name() to cope with long /proc/cpuinfo outputJon Medhurst2012-12-101-6/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | get_hardware_name() uses a fixed size buffer to slurp the contents of /proc/cpuinfo into and with newer multicore systems this is not big enough, leading to the inability to pick up the hardware name. Fix this by using a dynamically allocated, exponentially growing buffer. Change-Id: I51c6c276b6e110f462839e205a4428adc6656e75 Signed-off-by: Jon Medhurst <tixy@linaro.org>
* | | | | | | am a512c1ca: am 7b445a8e: Merge "Fix rotation in camera2 API" into klp-devMathias Agopian2013-09-182-1/+6
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'a512c1ca6322b54b6a74be01be53d537f5a81da4': Fix rotation in camera2 API
| * | | | | | am 7b445a8e: Merge "Fix rotation in camera2 API" into klp-devMathias Agopian2013-09-182-1/+6
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7b445a8e3a21055a5735585ca0890d14977032f0': Fix rotation in camera2 API
| | * \ \ \ \ \ Merge "Fix rotation in camera2 API" into klp-devMathias Agopian2013-09-182-1/+6
| | |\ \ \ \ \ \
| | | * | | | | | Fix rotation in camera2 APIMathias Agopian2013-09-172-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10804238 Change-Id: I093945789d9c6d373392fc9dfd18ec2c6058d3b9
* | | | | | | | | am 0e7bd81c: am 4f18183b: Merge "Initialize /dev/urandom earlier in boot." ↵Nick Kralevich2013-09-181-0/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-dev * commit '0e7bd81c938611cfa4ebf44870668300a5bba875': Initialize /dev/urandom earlier in boot.
| * | | | | | | | am 4f18183b: Merge "Initialize /dev/urandom earlier in boot." into klp-devNick Kralevich2013-09-181-0/+3
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4f18183bd6d3d2ed5d698c176ecc239211bdb82e': Initialize /dev/urandom earlier in boot.
| | * | | | | | | Merge "Initialize /dev/urandom earlier in boot." into klp-devNick Kralevich2013-09-181-0/+3
| | |\ \ \ \ \ \ \
| | | * | | | | | | Initialize /dev/urandom earlier in boot.Nick Kralevich2013-09-181-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's a security best practice to carry entropy across reboots. (see "man 4 random"). Currently, entropy saving and mixing occur in the system_server, via the EntropyMixer code. Unfortunately, the EntropyMixer code runs fairly late in the boot process, which means early boot doesn't have high quality entropy. This has caused security problems in the past. Load entropy data as soon as we can in the early boot process, so that we can get /dev/random / /dev/urandom into a "random" state earlier. Bug: 9983133 Change-Id: Id4a6f39e9060f30fe7497bd8f8085a9bec851e80
* | | | | | | | | | am 3929efb9: am 9d773b97: Merge "trace: Add support for tracing 64-bit ↵Jamie Gennis2013-09-181-0/+17
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | / | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | ints." into klp-dev * commit '3929efb9d480b8893eb3e95cd282dd161ab8fb12': trace: Add support for tracing 64-bit ints.
| * | | | | | | | am 9d773b97: Merge "trace: Add support for tracing 64-bit ints." into klp-devJamie Gennis2013-09-181-0/+17
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9d773b978b9fc26fb08a973e0290aba5432b720a': trace: Add support for tracing 64-bit ints.
| | * | | | | | | Merge "trace: Add support for tracing 64-bit ints." into klp-devJamie Gennis2013-09-181-0/+17
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | trace: Add support for tracing 64-bit ints.Jamie Gennis2013-09-181-0/+17
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10624956 Change-Id: Ie1d7c8ac16b5a5ec1e63e4fb1863f5b1ab2b59e8
* | | | | | | | am 18c34183: am 5535b051: write_file: introduce O_NOFOLLOW, use sane maskNick Kralevich2013-09-171-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '18c34183d76be2efbf2f498ec0185c1ceffa49f0': write_file: introduce O_NOFOLLOW, use sane mask
| * | | | | | | am 5535b051: write_file: introduce O_NOFOLLOW, use sane maskNick Kralevich2013-09-171-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '5535b05120fa3fd3d68a09e01284aba35cc6e058': write_file: introduce O_NOFOLLOW, use sane mask
| | * | | | | | write_file: introduce O_NOFOLLOW, use sane maskNick Kralevich2013-09-171-1/+1
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't follow symlinks when writing to a file. Don't create world-writable files. Bug: 10802869 Change-Id: Ifb55600d574307a535df878acb3347e02028cd30
* | | | | | | init.rc: no longer start healthd in charger modeTodd Poynor2013-09-171-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Being moved to healthd/charger mode in board-specific init.rc. Change-Id: Ie9fc2e5abc1737fbffec8fb071c73f5fd96e4d17
* | | | | | | healthd: move charger executable to healthd charger modeTodd Poynor2013-09-1714-497/+192
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add healthd charger mode ops * Check for executable invocation as "charger", set charger mode if so * Incorporate charger executable as healthd charger mode Change-Id: I4a44e7a4c3a65ae9be94491f7f498aa48d4f8a84
* | | | | | | healthd: move Android communication code to separate sourceTodd Poynor2013-09-176-45/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add ops for different "modes" of healthd operation: android vs. recovery * recovery mode selected by runstring options -r * binder/Android communication moved to android mode * recovery mode ops avoiding binder service registration * "no service manager" flag removed; now handled by android vs. other modes Change-Id: I3d8c89bf96a18a6a00cc85306f9a07d3f408f2a0
* | | | | | | healthd: add register event interfaceTodd Poynor2013-09-172-76/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Facilitates registering events from external source files. Add epoll events param to callbacks. Change-Id: Icf8fb0c62af11453cbcc92877ff2c3bc03b9bb1b
* | | | | | | am e6e5daac: am edeed28b: am 4a280e3d: Merge "Don\'t use control requests to ↵jp abgrall2013-09-171-78/+103
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | read device serial numbers." * commit 'e6e5daace55672b1ec8fb6c5c17a85ee1531f7ad': Don't use control requests to read device serial numbers.