summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "init: logd: Allow Developer settings to adjust logd size"Mark Salyzyn2014-05-163-9/+63
|\
| * init: logd: Allow Developer settings to adjust logd sizeMark Salyzyn2014-05-133-9/+63
| | | | | | | | | | | | | | | | | | | | | | | | - AID_SYSTEM can set persist.logd.size - AID_SYSTEM can issue command to /dev/socket/logd to change the runtime global log sizes. - Add support for ro.logd.size.* as populated by BoardConfig.mk - Limit size to maximum ~3% of physical memory. Bug: 14563261 Bug: 14627052 Change-Id: I606420db2e9d9d032296e71149e4a5b20cbd1137
* | Merge "libadf: silence false positive warning"Greg Hackmann2014-05-151-1/+1
|\ \
| * | libadf: silence false positive warningGreg Hackmann2014-05-071-1/+1
| | | | | | | | | | | | | | | | | | | | | Some versions of gcc warn that intfs may be used uninitialized Change-Id: I3b8d7e919e9c2902ac56adeabd09a45ececfb3c4 Signed-off-by: Greg Hackmann <ghackmann@google.com>
* | | Merge "Change app_process reference to app_process32."Narayan Kamath2014-05-151-1/+1
|\ \ \
| * | | Change app_process reference to app_process32.Narayan Kamath2014-05-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Required due to change 5a7ee9ad63 which makes app_process a symlink to the primary zygote. Change-Id: I940f6302db97f74dd57112e310014e989dc586e5
* | | | Merge ""stop" / "start must apply to the secondary zygote as well."Narayan Kamath2014-05-152-0/+2
|\ \ \ \
| * | | | "stop" / "start must apply to the secondary zygote as well.Narayan Kamath2014-05-132-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Would've been nice if we could use the sys property observer to start and stop all services in a service class but service classes do not appear to be fully supported. Change-Id: Iaf17a2dbcf913c4c646bc1e8e13adee9f952c45e
* | | | | Merge "ps: add flag to show ABI"Kenny Root2014-05-151-4/+47
|\ \ \ \ \
| * | | | | ps: add flag to show ABIKenny Root2014-05-141-4/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow us to easily identify the 32/64 bitness of the process. Yes, I know this is not technically an ABI, but it seemed close enough! Change-Id: Ia03a17fd74d61e7619911cb26b3dd7d82b62930c
* | | | | | Merge "Clean up some unnecessary system_properties cruft."Elliott Hughes2014-05-143-6/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Clean up some unnecessary system_properties cruft.Elliott Hughes2014-05-143-6/+0
| | |/ / / | |/| | | | | | | | | | | | | | | | | | Bug: 14970171 Change-Id: I6f54c35e265b849be914120f795c9f8e0cec34bb
* | | | | Merge changes If5359c26,I5d09be41Sreeram Ramachandran2014-05-141-0/+39
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Use a function instead of a macro. Mark sockets on accept().
| * | | | | Use a function instead of a macro.Sreeram Ramachandran2014-05-141-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit f3e4a8bb245afe874561eb7275f49dae0e7e55dd) Change-Id: If5359c26a1474de0c278193fd2f09168f3184dee
| * | | | | Mark sockets on accept().Sreeram Ramachandran2014-05-141-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 1321cfecc6fb0e075796a34ed3c6a30d7ff3bea3) Change-Id: I5d09be413cf720fbed905f96313b007997ada76c
* | | | | | Merge "Introduce netd_client, a dynamic library that talks to netd."Sreeram Ramachandran2014-05-145-0/+230
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Introduce netd_client, a dynamic library that talks to netd.Sreeram Ramachandran2014-05-145-0/+230
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This library is dynamically loaded and used by bionic, to replace selected standard socket syscalls with versions that talk to netd. Implement connect() by requesting that the socket be marked with the netId of the default network and then calling through to the actual syscall. There are two escape hatches: + If the fwmark server is unavailable, it isn't an error; we proceed with the syscall. This might help at boot time (when the server isn't ready yet) and if we get rid of the fwmarkd socket entirely in future platform versions. + If the ANDROID_NO_USE_FWMARK_CLIENT environment variable is set, we don't attempt to use the fwmark server (even if it's available). This allows apps to sidestep unforseen issues in production at runtime. (cherry picked from commit 0581cb455ef924f128a5c6d46bc70868b5099eec) Change-Id: Ib6198e19dbc306521a26fcecfdf6e8424d163fc9
* | | | | | Merge "Introduce fwmarkd: a service to set the fwmark of sockets."Sreeram Ramachandran2014-05-141-0/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Introduce fwmarkd: a service to set the fwmark of sockets.Sreeram Ramachandran2014-05-141-0/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit d5121e212c1f53b1cb6458ee83be892d94fdfef3) Change-Id: Ieb049fe34ea2b21a7f6108f2099d1a8b8f2c28f7
* | | | | Merge "fastboot: turn on -Werror"Mark Salyzyn2014-05-147-42/+32
|\ \ \ \ \
| * | | | | fastboot: turn on -WerrorMark Salyzyn2014-05-147-42/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Deal with a missing initializer issue - Deal with some -Wunused issues - Deal with some signed/unsigned issues - switch to usleep from sleep to facilitate win_sdk compile Change-Id: I64e32a5b0782aeed9582f489e866173c4df1afbf
* | | | | | Merge "libzipfile: turn on -Werror"Mark Salyzyn2014-05-143-36/+10
|\ \ \ \ \ \ | |/ / / / / | | / / / / | |/ / / / |/| | | |
| * | | | libzipfile: turn on -WerrorMark Salyzyn2014-05-143-36/+10
|/ / / / | | | | | | | | | | | | | | | | | | | | - resolve some unused references Change-Id: Ia3748c7e25963c2fd3d58e175177f0f4dd405997
* | | | Merge "Set kernel proc files for fwmark reflection and table numbers for RAs."Sreeram Ramachandran2014-05-131-0/+7
|\ \ \ \
| * | | | Set kernel proc files for fwmark reflection and table numbers for RAs.Sreeram Ramachandran2014-05-131-0/+7
|/ / / / | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 2c2807ac1041751583e0c3b6892ca56eae423fa2) Change-Id: I5f0d759cb9b8590555af7f5503f00d3e455ece54
* | | | Merge "adb: avoid compilation errors for unused results"Kenny Root2014-05-131-2/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | adb: avoid compilation errors for unused resultsKenny Root2014-05-131-2/+2
|/ / / | | | | | | | | | | | | | | | | | | The BIO_CTRL_FLUSH function for files doesn't return anything useful from the underlying fflush call, so it is safe to ignore this. Change-Id: If33a7efbbaaf158e3da1cd72d0a56da1d3b82fd9
* | | Merge "Remove declaration of unused static variable"Ian Rogers2014-05-121-2/+0
|\ \ \ | |/ / |/| |
| * | Remove declaration of unused static variableBernhard Rosenkraenzer2014-05-121-2/+0
|/ / | | | | | | | | | | | | | | The declaration is useless and triggers a warning with clang 3.5 (in code that's built with -Werror) Change-Id: I8fc42178df264509dcce6e1f1ba318bf849307e3 Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
* | Merge "Only include ucontext.h when necessary."Christopher Ferris2014-05-104-2/+3
|\ \
| * | Only include ucontext.h when necessary.Christopher Ferris2014-05-094-2/+3
|/ / | | | | | | Change-Id: I29014f6c6b82e0a9797e5d76147b3c4e3d82a7f5
* | Merge "Fix ucontext_t forward declare for mac."Christopher Ferris2014-05-091-0/+5
|\ \
| * | Fix ucontext_t forward declare for mac.Christopher Ferris2014-05-091-0/+5
|/ / | | | | | | Change-Id: I30470f5cc25553dee25d4858f64ec5af13aa20c9
* | Merge "Fix mac build."Christopher Ferris2014-05-091-1/+3
|\ \
| * | Fix mac build.Christopher Ferris2014-05-091-1/+3
|/ / | | | | | | | | | | | | Forward declare ucontext_t so that it's not necessary for ucontext.h to be included in the global header. Change-Id: Ic13677dd572ab1acd927f0a17b284f9b417a642f
* | Merge "Rewrite unwind thread handling."Christopher Ferris2014-05-0911-258/+269
|\ \
| * | Rewrite unwind thread handling.Christopher Ferris2014-05-0811-258/+269
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This new version doesn't require any specialized thread implementation, it uses the Current implementation to do its job. In addition, it runs much faster when multiple threads are trying to unwind at the same time since the global signal lock is held for only a small amount of time. Even running through the threads one at a time should be faster since it no longer requires two passes through the unwound stacks. The new code now allows multiple simultaneous unwinds of the same thread. Finally, add the ability to unwind from a ucontext_t passed in. This functionality doesn't work for remote unwinds yet. Change-Id: I4d181d7ca5ffd2acfd1686e668e6d21e36b425cb
* | | Merge "libziparchive: off64_t is not int64_t (part deux)"JP Abgrall2014-05-091-4/+4
|\ \ \
| * | | libziparchive: off64_t is not int64_t (part deux)Mark Salyzyn2014-05-081-4/+4
|/ / / | | | | | | | | | Change-Id: I38e78bdba338a0c40aec43d6c86f26f388cee6ab
* | | Merge "libziparchive: off64_t is not int64_t"JP Abgrall2014-05-091-10/+10
|\ \ \
| * | | libziparchive: off64_t is not int64_tMark Salyzyn2014-05-081-10/+10
|/ / / | | | | | | | | | | | | | | | - ToDo: investigate why our system headers let us down. Change-Id: Iada422adbbbd4fbd0fc09b51b97b3cd06ccc6374
* | | Merge "libziparchive: 64 bit issues"Mark Salyzyn2014-05-081-12/+13
|\ \ \
| * | | libziparchive: 64 bit issuesMark Salyzyn2014-05-081-12/+13
|/ / / | | | | | | | | | Change-Id: I1b53aff5b1527a3623d17deed306624707d345ef
* | | Merge "run-as: build 1161573 failure"Mark Salyzyn2014-05-081-1/+3
|\ \ \
| * | | run-as: build 1161573 failureMark Salyzyn2014-05-081-1/+3
|/ / / | | | | | | | | | | | | - pointer to integer comparison. Change-Id: I4a12c357ff5eaf2fc08c19c9efe7e2d7cb0dbe2e
* | | Merge "libsparse: turn on -Werror"Mark Salyzyn2014-05-085-19/+14
|\ \ \
| * | | libsparse: turn on -WerrorMark Salyzyn2014-05-075-19/+14
| | | | | | | | | | | | | | | | | | | | | | | | - Deal with some -Wunused issues Change-Id: I9667d74c0dfbe55c625e65b9d44d7c6f861c455d
* | | | Merge "fs_mgr: turn on -Werror"Mark Salyzyn2014-05-083-3/+3
|\ \ \ \ | |/ / /
| * | | fs_mgr: turn on -WerrorMark Salyzyn2014-05-073-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | - deal with some -Wunused-variable issues Change-Id: Ie0140d4777ddf862e4bbed76142a1dbb8320c1b0
* | | | Merge "libmincrypt: suppress warning messages"Mark Salyzyn2014-05-083-6/+17
|\ \ \ \ | |/ / /