summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "toolbox: turn on -Werror"Mark Salyzyn2014-05-2127-84/+58
|\
| * toolbox: turn on -WerrorMark Salyzyn2014-05-1427-84/+58
| | | | | | | | | | | | | | | | | | - Deal with some signedness issues - Deal with some size issues - Deal with NULL pointer issues - Deal with some -Wunused issues Change-Id: I1479dd90d690084491bae3475f2c547833519a57
* | Merge "Fix win32 undefined reference to `_socket_network_client_timeout'."Elliott Hughes2014-05-203-18/+16
|\ \
| * | Fix win32 undefined reference to `_socket_network_client_timeout'.Elliott Hughes2014-05-203-18/+16
|/ / | | | | | | Change-Id: I063213957b8452f4690da0f64872075f7c27b4cd
* | Merge "Address additional warnings found by GCC 4.9."Ben Cheng2014-05-201-1/+1
|\ \
| * | Address additional warnings found by GCC 4.9.Ben Cheng2014-05-201-1/+1
|/ / | | | | | | Change-Id: I8aae6c3e1ccc2294f4db455e1b4f3b4c34a00aaf
* | Merge "Fix win32 implicit declaration of function ↵Elliott Hughes2014-05-201-0/+2
|\ \ | | | | | | | | | socket_network_client_timeout."
| * | Fix win32 implicit declaration of function socket_network_client_timeout.Elliott Hughes2014-05-201-0/+2
|/ / | | | | | | Change-Id: Ic6070855a21920384c555c9c82b9a2e4a776cbae
* | Merge "Fix Windows socket_network_client.c build failures."Elliott Hughes2014-05-191-1/+8
|\ \
| * | Fix Windows socket_network_client.c build failures.Elliott Hughes2014-05-191-1/+8
|/ / | | | | | | Change-Id: Ie67a2305ade02e078bf0edf54104c295b091b1b7
* | Merge "Bound the ADB connect time with a non-blocking connect"Elliott Hughes2014-05-193-6/+75
|\ \
| * | Bound the ADB connect time with a non-blocking connectKen Lierman2014-05-193-6/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After a disconnect, the initial blocking connect takes a long time to return, while subsequent calls return quicks. Switch to a non-blocking connect to make the re-connect time more consistent and faster overall. Change-Id: I21d02b22a8eb9a457c2f1fa95eb17894d5612ccd Signed-off-by: Ken Lierman <ken.lierman@windriver.com> Reviewed-by: Gumbel, Matthew K <matthew.k.gumbel@intel.com> Reviewed-by: Jovanovic, Radivoje <radivoje.jovanovic@intel.com> Reviewed-by: Boie, Andrew P <andrew.p.boie@intel.com>
* | | Merge "Really fixes the ub branches"Dan Albert2014-05-191-1/+1
|\ \ \
| * | | Really fixes the ub branchesDan Albert2014-05-191-1/+1
|/ / / | | | | | | | | | Change-Id: I1d78f4e6c1d8086c2895f6739c3202e9ef74fee2
* | | Merge "Fix unbundled branches"Dan Albert2014-05-191-0/+3
|\ \ \ | |/ / |/| |
| * | Fix unbundled branchesDan Albert2014-05-191-0/+3
|/ / | | | | | | Change-Id: Ic8a58a6cf55221ec361bbb80c7c9636fe1349943
* | Merge "Adds libc++ versions of libbacktrace"Dan Albert2014-05-192-1/+46
|\ \
| * | Adds libc++ versions of libbacktraceDan Albert2014-05-192-1/+46
|/ / | | | | | | Change-Id: I4a1ce30e7c2166ac1846cc90de0252beee542ee6
* | Merge "Teach debuggerd the name of SIGTRAP."Elliott Hughes2014-05-172-13/+12
|\ \
| * | Teach debuggerd the name of SIGTRAP.Elliott Hughes2014-05-162-13/+12
|/ / | | | | | | | | | | | | Also add SIGTRAP to the list of signals we don't want to double fault on. Bug: 15024256 Change-Id: I23ab80800563c007fcd3e42527329fedf762f0c8
* | Merge "Remove the broken LED flashing code from debuggerd."Elliott Hughes2014-05-171-63/+2
|\ \
| * | Remove the broken LED flashing code from debuggerd.Elliott Hughes2014-05-161-63/+2
|/ / | | | | | | Change-Id: I4d0cbe14daa90ac5f91ce4597584448ee3c65dda
* | Merge "Output correct gdbserver instructions from debuggerd."Elliott Hughes2014-05-171-14/+34
|\ \
| * | Output correct gdbserver instructions from debuggerd.Elliott Hughes2014-05-161-14/+34
|/ / | | | | | | | | Bug: 15021938 Change-Id: I2df433d939f5f83ed2a2a30af357b83e4d8e5331
* | Merge "Fix host 64-bit build."Ying Wang2014-05-172-3/+4
|\ \
| * | Fix host 64-bit build.Ying Wang2014-05-162-3/+4
| | | | | | | | | | | | | | | Bug: 13751317 Change-Id: Ib42d24408d053bacc24142ed18fc5f3181d2345b
* | | Merge "Add SIGTRAP support to crasher and debuggerd."Elliott Hughes2014-05-172-2/+7
|\ \ \
| * | | Add SIGTRAP support to crasher and debuggerd.Elliott Hughes2014-05-162-2/+7
| | | | | | | | | | | | | | | | | | | | Bug: 15024256 Change-Id: I3f34993fcfd9799306852b0a2195db468370be6e
* | | | Merge "correct the setenv option judging condition"Colin Cross2014-05-161-1/+1
|\ \ \ \
| * | | | correct the setenv option judging conditionGavin.Chang2014-05-161-1/+1
|/ / / / | | | | | | | | | | | | Change-Id: I10ed6275374f572da639f26611f607bf7607905c
* | | | Merge "logd: logcat: debuggerd: auditd logs to events"Mark Salyzyn2014-05-165-49/+89
|\ \ \ \ | |_|/ / |/| | |
| * | | logd: logcat: debuggerd: auditd logs to eventsMark Salyzyn2014-05-155-49/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - auditd switch to recording logs to events log id - logcat add events as one of the default logs - debuggerd collect events log as well. ToDo: debuggerd & bugreport collect intermixed logs. BUG: 14626551 Change-Id: I958f0e729b7596748be57488a38824db5645be7b
* | | | 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
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | |
generated by cgit v1.1 at 2024-09-14 10:11:44 +0000