summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Remove dead code."Elliott Hughes2014-02-207-764/+0
|\
| * Remove dead code.Elliott Hughes2014-02-207-764/+0
| | | | | | | | | | | | | | We have benchmarking for memset in bionic itself, and a benchmarking framework for other native benchmarking. Change-Id: I241a288a96d3b2d37f3d51b04a519ac23f18a989
* | Merge "Handle FUSE_FSYNCDIR as FUSE_FSYNC"JP Abgrall2014-02-191-2/+2
|\ \
| * | Handle FUSE_FSYNCDIR as FUSE_FSYNCDaisuke Okitsu2014-02-191-2/+2
|/ / | | | | | | | | | | | | | | There have been issues with sdcard data corruption even after successfully calling fsync for /sdcard. This is caused by the sdcard daemon doing nothing in this case. Change-Id: I48149ceabdac79ac535b35c2598bb1fbb5410883
* | Merge "sdcard: direct I/O file access write buffer alignment"JP Abgrall2014-02-191-0/+6
|\ \
| * | sdcard: direct I/O file access write buffer alignmentArpad Horvath2014-02-181-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | It is not enough to align the read buffer only, because consequent writes might still fail with EINVAL. The write buffer should be also aligned according to the write(2) manual page. Change-Id: I7547dec5208732c56f4466c1b0c88f36dabacf5b
* | | Merge "Enable building init with -Wall -Werror."Nick Kralevich2014-02-193-11/+46
|\ \ \ | |_|/ |/| |
| * | Enable building init with -Wall -Werror.Stephen Smalley2014-02-193-11/+46
|/ / | | | | | | | | | | | | | | Eliminates various warnings from SELinux-related code. Bug: 12587913 Change-Id: I28921f0ebd934324436609540d95ccef58552b64 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* | Merge "Start debuggerd64 for 64-bit processes"Colin Cross2014-02-161-0/+3
|\ \ | |/ |/|
| * Start debuggerd64 for 64-bit processesDan Willemsen2014-02-161-0/+3
|/ | | | Change-Id: I2fc33d9eb2726b043d2f13bfab0c605dbb6083c7
* Merge "sdcard: direct I/O file access fix"JP Abgrall2014-02-151-4/+5
|\
| * sdcard: direct I/O file access fixArpad Horvath2014-02-141-4/+5
|/ | | | | | | | | | If a file is opened in direct I/O mode (with O_DIRECT flag), the read buffer addess must be aligned to memory page size boundary. The Direct I/O is not needed for normal files, however, some special hardware access (e.g. smart SD cards) will not work without it. Change-Id: I42babeee86dba1880fd23e2592fddd7060da3e20
* Merge "charger: add locale global variable"Colin Cross2014-02-131-0/+2
|\
| * charger: add locale global variableColin Cross2014-02-131-0/+2
| | | | | | | | | | | | | | | | | | Some functions in minui reference a global extern char *locale. None of them are used by charger, but the bfd linker cannot optimize them out and fails to link charger. Define char *locale in charger.c so it can resolve the symbol. Change-Id: I738daf95d24356bf96bd226d91a5dc64b5d4dc9b
* | Merge "build debuggerd and debuggerd64 on 64-bit architectures"Colin Cross2014-02-132-50/+89
|\ \ | |/
| * build debuggerd and debuggerd64 on 64-bit architecturesColin Cross2014-02-122-50/+89
|/ | | | Change-Id: I1518d45ae0c5e0fed31d071fdaf19a67bad1bdfc
* Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."Nick Kralevich2014-02-124-6/+6
|\
| * Convert all selinux_android_restorecon and _setfilecon calls to new API.Stephen Smalley2014-02-074-6/+6
| | | | | | | | | | | | | | | | | | | | | | libselinux selinux_android_restorecon API is changing to the more general interface with flags and dropping the older variants. Also get rid of the old, no longer used selinux_android_setfilecon API and rename selinux_android_setfilecon2 to it as it is the only API in use. Change-Id: I1e71ec398ccdc24cac4ec76f1b858d0f680f4925 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* | Merge "pixelflinger: support multilib builds"Colin Cross2014-02-121-35/+31
|\ \
| * | pixelflinger: support multilib buildsColin Cross2014-02-111-35/+31
| | | | | | | | | | | | | | | | | | | | | Use the LOCAL_*_arch variables to support building for 32-bit and 64-bit at the same time. Change-Id: Ibef8044e8b6500a6aa111320eb35bcdaf51ad064
* | | Merge "x86_64: Add atomic funtions"Elliott Hughes2014-02-122-1/+229
|\ \ \
| * | | x86_64: Add atomic funtionsQiming Shi2014-02-112-1/+229
|/ / / | | | | | | | | | | | | | | | | | | This patch adds atomic functions for x86_64. Change-Id: I298c760a1e6efa2ce2c61a143f833b6785805442 Signed-off-by: Qiming Shi <qiming.shi@intel.com>
* | | Merge "pixelflinger: use __builtin___clear_cache instead of cacheflush"Colin Cross2014-02-112-7/+3
|\ \ \ | |/ /
| * | pixelflinger: use __builtin___clear_cache instead of cacheflushColin Cross2014-02-112-7/+3
|/ / | | | | | | | | | | | | cacheflush doesn't exist on LP64 any more, and gcc's __builtin___clear_cache is better in every way. Use it instead. Change-Id: Ibbf6facbdefc15b6dda51d014e1c44fb7aa2b17d
* | Merge "log: add compile-time checking when ALOGV is disabled"Colin Cross2014-02-101-7/+14
|\ \
| * | log: add compile-time checking when ALOGV is disabledColin Cross2014-02-091-7/+14
|/ / | | | | | | | | | | | | | | | | | | Wrap the call in a if (0) when verbose logging is disabled to provide compile time checking. Also add a printf format attribute to the function to warn if parameters are incorrect. Change-Id: Ic77edeadcc4d886ca0f8b434f8550e18e22d5901
* | Merge "Use stat structure to keep oldest mtime."Christopher Ferris2014-02-081-20/+11
|\ \
| * | Use stat structure to keep oldest mtime.Christopher Ferris2014-02-071-20/+11
| |/ | | | | | | Change-Id: If9496127db28d2dcd09bc5b3144632a43afb8d55
* | Merge "Remove a pre-uapi hack from nandread."Elliott Hughes2014-02-081-4/+0
|\ \
| * | Remove a pre-uapi hack from nandread.Elliott Hughes2014-02-071-4/+0
|/ / | | | | | | | | | | We only have uapi headers now. Change-Id: I2c02e10bb3bba4006579772f3ab2a18c2df7535d
* | Merge "Fix logging errors inside ALOGV"Colin Cross2014-02-072-2/+3
|\ \
| * | Fix logging errors inside ALOGVColin Cross2014-02-072-2/+3
| |/ | | | | | | | | | | Fix errors exposed by adding checking to disabled ALOGVs. Change-Id: I36b77bb0ad8dc7661b0f834f20d1179b86134d57
* | Merge "Use socklen_t instead of int in debuggerd."Elliott Hughes2014-02-071-11/+9
|\ \ | |/ |/|
| * Use socklen_t instead of int in debuggerd.Elliott Hughes2014-02-071-11/+9
|/ | | | | | Also other trivial C++ cleanup. Change-Id: I9b5278c5205e0ea4f9dcbbe3e7b99921dd2436dc
* Merge "Unify toolbox restorecon and libselinux restorecon implementations."Nick Kralevich2014-02-061-92/+15
|\
| * Unify toolbox restorecon and libselinux restorecon implementations.Stephen Smalley2014-02-061-92/+15
|/ | | | | | | | | | | | | | | | Extend the libselinux restorecon implementation to allow reuse by the toolbox restorecon command. This simply requires adding support for the nochange (-n) and verbose (-v) options to the libselinux functions and rewriting the toolbox restorecon command to use the libselinux functions. Also add a force (-F) option to support forcing a restorecon_recursive even if the restorecon_last attribute matches the current file_contexts hash so that we can continue to force a restorecon via the toolbox command for testing or when we know something else has changed (e.g. for when we support relabeling /data/data and package information has changed). Change-Id: I92bb3259790a7195ba56a5e9555c3b6c76ceb862 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* Merge "system/core LP64 cleanup."Elliott Hughes2014-02-069-25/+30
|\
| * system/core LP64 cleanup.Elliott Hughes2014-02-059-25/+30
|/ | | | | | | Fixes -Wint-to-pointer and -Wpointer-to-int warnings, plus various -Wformat warnings. Change-Id: I6c5eea6b4273d82d28b8e5d2925f3e5457511b17
* Merge "Revert "Move to the canonical UniquePtr.h.""Elliott Hughes2014-02-042-1/+240
|\
| * Revert "Move to the canonical UniquePtr.h."Elliott Hughes2014-02-042-1/+240
| | | | | | | | | | | | This reverts commit 2a72c575d260cd256f767b7ad511a6959444134b. Change-Id: Idb485f1be2906e8c1c8f0da3df186a7aade027f6
* | Merge "Move to the canonical UniquePtr.h."Elliott Hughes2014-02-042-240/+1
|\ \ | |/
| * Move to the canonical UniquePtr.h.Elliott Hughes2014-02-042-240/+1
| | | | | | | | Change-Id: I5330c36d2b571acb6d3debd30b8020e33aa8a4a7
* | Merge "libsysutil: frequent native crash /system/bin/vold"Mark Salyzyn2014-02-041-12/+24
|\ \ | |/ |/|
| * libsysutil: frequent native crash /system/bin/voldMark Salyzyn2014-01-311-12/+24
| | | | | | | | | | | | | | | | | | | | | | | | regression from commit a6e965578e44f9ae5f98de822ba5decec381dffc * wrap writev with sigaction SIG_IGN SIGPIPE to emulate the send(,,,MSG_NOSIGNAL) call it had replaced. (cherry pick from commit 83fc720785c4e40f3341daf7c0bf5ee99261fee9) BUG: 12796279 Change-Id: I14363630ada79c0a5b85bb6b2afd0a1c4d5c3109
* | Merge "Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc ↵Nick Kralevich2014-02-041-1/+5
|\ \ | | | | | | | | | file."
| * | Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file.Stephen Smalley2014-01-291-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mkdir /data/misc/wifi subdirectories and /data/misc/dhcp is performed in the various device-specific init*.rc files but seems generic. Move it to the main init.rc file. Drop the separate chown for /data/misc/dhcp as this is handled by mkdir built-in if the directory already exists. Add a restorecon_recursive /data/misc/wifi/sockets. Change-Id: I51b09c5e40946673a38732ea9f601b2d047d3b62 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* | | Merge "Call a specialized local map set."Christopher Ferris2014-02-011-3/+3
|\ \ \
| * | | Call a specialized local map set.Christopher Ferris2014-02-011-3/+3
| | | | | | | | | | | | | | | | | | | | Bug: 12852152 Change-Id: I8a0c558bc218805b0e06371af0af055e4aa6e0bb
* | | | Merge "Fix mips build."Christopher Ferris2014-02-011-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fix mips build.Christopher Ferris2014-02-011-1/+1
|/ / / | | | | | | | | | Change-Id: I5401ae6ca6553ebbec231166820c1c904355ec63