summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Use new defines in test code."Christopher Ferris2013-11-052-17/+15
|\
| * Use new defines in test code.Christopher Ferris2013-11-052-17/+15
|/ | | | | | | In addition, fix up the warnings and remove the -fpermissive when compiling. Change-Id: Ia27b902499b34ff3d881acb9057120af390baf2c
* Merge "Add some clarifying defines."Christopher Ferris2013-11-052-3/+11
|\
| * Add some clarifying defines.Christopher Ferris2013-11-052-3/+11
|/ | | | | | | In order to be explicit in the Backtrace::Create() calls, adding a couple of defines and some comments to describe what they mean. Change-Id: I6ad08c529791821496a95fa33cea1c95b0a7eada
* Merge "Dispose of ash."Elliott Hughes2013-11-0585-25738/+2
|\
| * Dispose of ash.Elliott Hughes2013-11-0585-25738/+2
| | | | | | | | | | | | | | | | | | | | | | We haven't used ash for several releases. Remove ash and its companion liblinenoise. I've left the support for an alternative shell here for now, but we can move that out to external/mksh later if we want. (For now this seemed like a somewhat useful signpost to the real shell.) Change-Id: I634c7969f6cbe375a2bc56fc1077e64888380f3d
* | Merge "Add corkscrew support for finding static symbols."Christopher Ferris2013-11-041-7/+25
|\ \ | |/ |/|
| * Add corkscrew support for finding static symbols.Christopher Ferris2013-11-041-7/+25
|/ | | | Change-Id: Ie557a9b0efadece75e1accaa7e214fb559eb19e1
* Merge "More libbacktrace fixes."Christopher Ferris2013-10-308-121/+117
|\
| * More libbacktrace fixes.Christopher Ferris2013-10-308-121/+117
| | | | | | | | | | | | | | | | | | | | | | | | Included in minor fix ups is the addition of a warning macro to replace all of the ALOGW calls. Fix a race where multiple threads could be attempting to unwind the threads of the current process at the same time. Bug: 8410085 Change-Id: I02a65dc778dde690e5f95fc8ff069a32d0832fd1
* | Merge "Fix a bunch of small system/core bugs."Elliott Hughes2013-10-299-4/+17
|\ \ | |/ |/|
| * Fix a bunch of small system/core bugs.Elliott Hughes2013-10-299-4/+17
|/ | | | | | | | | | | | | | | | | | | | | Missing frees in: adb/file_sync_client.c fastboot/fastboot.c libsparse/output_file.c Missing closedirs in: adb/file_sync_service.c cpio/mkbootfs.c libcutils/dir_hash.c Potential buffer overrun in: gpttool/gpttool.c Incorrect NULL check in: libsparse/backed_block.c Bug: https://code.google.com/p/android/issues/detail?id=61564 Change-Id: If97838a9e73a77aef7f416c31c237ce1fca4ce21
* Merge "Rewrite libbacktrace using C++."Christopher Ferris2013-10-2928-1059/+2398
|\
| * Rewrite libbacktrace using C++.Christopher Ferris2013-10-2828-1059/+2398
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The old code was essentially trying to be C++ in C and was awkward. This change makes it all objects with a thin layer that C code can use. There is a C++ backtrace object that is not very useful, this code will replace it. This change also includes moving the backtrace test to a gtest, and adding coverage of all major functionality. Bug: 8410085 Change-Id: Iae0f1b09b3dd60395f71ed66010c1ea5cdd37841
* | Merge "Improve some adb error logging"Brian Carlstrom2013-10-282-2/+4
|\ \
| * | Improve some adb error loggingBrian Carlstrom2013-10-272-2/+4
|/ / | | | | | | | | Bug: 11290643 Change-Id: Ibad4e9f0b69421cd6017b70a52237e7f27aab848
* | Merge "Eliminate text relocations in x86 optimized memset versions"Elliott Hughes2013-10-242-8/+8
|\ \ | |/ |/|
| * Eliminate text relocations in x86 optimized memset versionsPavel Chupin2013-10-242-8/+8
|/ | | | | Change-Id: Ieb72af8cf7f93210a68a87b1e2538deb5642f4d5 Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
* Merge "Use %zd for size_t."Elliott Hughes2013-10-191-1/+1
|\
| * Use %zd for size_t.Elliott Hughes2013-10-181-1/+1
|/ | | | Change-Id: I0139243c309e85236eb00bb471736bdd99eeec84
* Merge "Wait for device to disappear after reboot-bootloader."JP Abgrall2013-10-179-59/+122
|\
| * Wait for device to disappear after reboot-bootloader.Mark Wachsler2013-10-179-59/+122
|/ | | | | | | | | | | | | | | | (Linux only for now) With fastboot reading serial numbers from sysfs, it had become possible for a fastboot command issued immediately after rebooting the bootloader to fail, because sysfs still thought the device was online. To prevent this, after reboot-bootloader we wait for the device to disconnect. Also made usb_read and usb_write fail immediately if the descriptor has been closed; this prevents an incorrect error message ("Bad file descriptor") when errors from fb_getvar are ignored (e.g., by fb_format_supported). Also removed unused fd param from filter_usb_device, and simplified logic in usb_write by using do/while instead of a special case for len == 0. Change-Id: I799b857eab411fd8ad25f5777fc61c685152ea86
* Merge "init: remove obsolete rle logo"JP Abgrall2013-10-174-190/+21
|\
| * init: remove obsolete rle logoMarcin Chojnacki2013-10-164-190/+21
|/ | | | | | | | | Obsolete RLE 565 logo is used nowhere, because 565 framebuffer isn't used for years. It's not necessary to keep this thing alive anymore. Change-Id: Ie61e168790f791230530cd3eb1c68b1f7344c9a7
* Merge "Add a restorecon_recursive built-in command to init."Nick Kralevich2013-10-104-3/+24
|\
| * Add a restorecon_recursive built-in command to init.Stephen Smalley2013-10-104-3/+24
| | | | | | | | | | | | | | | | | | | | | | Functionally equivalent to the restorecon -R toolbox command. A use case is given by: I48eaa2b9901ac8c978192c14493ba1058a089423 Also, fix error handling and documentation for restorecon command. Change-Id: Ia7fbcc82645baf52c6bff0490d3492f458881cbb Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* | Merge "Add support for ECDSA P-256 with SHA256"Kenny Root2013-10-1016-34/+2580
|\ \
| * | Add support for ECDSA P-256 with SHA256Kenny Root2013-10-0916-34/+2580
| |/ | | | | | | | | | | | | This adds a small EC library that is capable of verifying a signature of SHA256 with ECDSA on the NIST P-256 curve. Change-Id: I2a16639c92a77e8e4783c47ffbc56676de56eb59
* | Merge "libcutils doesn't need to be looking at bionic's privates."Elliott Hughes2013-10-101-5/+0
|\ \
| * | libcutils doesn't need to be looking at bionic's privates.Elliott Hughes2013-10-101-5/+0
|/ / | | | | | | Change-Id: Ib11a0c1bdc4b85c58274b21a07aa92f958d23713
* | Merge "Cleanup x86 flags and memset versions"Elliott Hughes2013-10-103-21/+2
|\ \
| * | Cleanup x86 flags and memset versionsPavel Chupin2013-10-103-21/+2
|/ / | | | | | | | | | | | | ARCH_X86_HAVE_SSE2 is always true Change-Id: I680493d14280aafad5448aec727e8d9a84a6db00 Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
* | Merge "Fix bug in abort message processing."Christopher Ferris2013-10-101-1/+0
|\ \ | |/ |/|
| * Fix bug in abort message processing.Christopher Ferris2013-10-091-1/+0
|/ | | | | Bug: 11156592 Change-Id: I4b82e7be5d7fccd167f6c52f78a5af3d3a553779
* Merge "Update debuggerd to use libbacktrace."Christopher Ferris2013-10-048-204/+172
|\
| * Update debuggerd to use libbacktrace.Christopher Ferris2013-10-038-204/+172
| | | | | | | | | | | | | | | | | | | | | | | | Remove all of the code in debuggerd that uses libcorkscrew directly and replace with libbacktrace. Also do a bit of refactoring to clean up some functions that were passing around variables that weren't used. Bug: 8410085 Change-Id: I27da4fbe3f12ce38a85b4432fc1119984c9c391b
* | Merge "Set security context of /adb_keys and /data/misc/adb/adb_keys."Colin Cross2013-10-031-0/+7
|\ \
| * | Set security context of /adb_keys and /data/misc/adb/adb_keys.Stephen Smalley2013-10-011-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | I97b3d86a69681330bba549491a2fb39df6cf20ef introduced a separate type for the adb_keys file. Set the security context of the adb_keys file accordingly by adding restorecon commands to init.rc. Change-Id: I30e4d2a1ae223a03eadee58a883c79932fff59fe Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* | | Merge "Expose /dev/hw_random to group "system"."Alex Klyubin2013-10-031-0/+2
|\ \ \
| * | | Expose /dev/hw_random to group "system".Alex Klyubin2013-10-031-0/+2
|/ / / | | | | | | | | | | | | | | | | | | This is needed to let EntropyMixer (runs inside system_server) read from /dev/hw_random. Change-Id: Ifde851004301ffd41b2189151a64a0c5989c630f
* | | Merge "Only build host library on linux-x86."Christopher Ferris2013-10-021-32/+32
|\ \ \
| * | | Only build host library on linux-x86.Christopher Ferris2013-10-021-32/+32
| | |/ | |/| | | | | | | Change-Id: I26d5bd4b34c3669897fea1488fa58972f4299757
* | | Merge "Handle screendumps for all framebuffer sizes"Colin Cross2013-10-021-7/+9
|\ \ \ | |/ / |/| |
| * | Handle screendumps for all framebuffer sizesChris Dearman2013-09-251-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | readx() treats a partial read as an error but also consumes the data, Now exactly the amount of data needed for the screendump is requested. This bug showed up for framebuffers that were not a multiple of 640 bytes. Also fix a compiler warning related to handing pipe() failure. Change-Id: I8b1713923e156d4e3424784152e5dc5cbc7d478d
* | | Merge "Fix problems in libbacktrace."Christopher Ferris2013-10-023-6/+42
|\ \ \ | |_|/ |/| |
| * | Fix problems in libbacktrace.Christopher Ferris2013-10-013-6/+42
|/ / | | | | | | | | | | | | | | | | - Add a wait for stop to backtrace_test. There is a possible race condition that is exposed when using libunwind. - Fix a few calls to unwind function calls. Bug: 8410085 Change-Id: I7487d687f6d4b7b05b8a96ad1c5f7183681e5c95
* | Merge "Trigger a policy reload from post-fs-data."Colin Cross2013-09-301-0/+3
|\ \
| * | Trigger a policy reload from post-fs-data.Stephen Smalley2013-08-261-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Once userdata is available and decrypted, trigger a policy reload to pick up any policy update files stored under /data/security. Change-Id: Ic2b3121c3395429b108c40d1d7f5a3124a5896c5 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* | | Merge "Update comment from review."Christopher Ferris2013-09-301-1/+1
|\ \ \
| * | | Update comment from review.Christopher Ferris2013-09-301-1/+1
|/ / / | | | | | | | | | | | | | | | | | | Missed this typo that enh pointed out. Bug: 8410085 Change-Id: Ic636ae218fc153bc5e3b1a0fdc2f7161980e5eec