Commit graph

8174 commits

Author SHA1 Message Date
Elliott Hughes
a7952c5c59 am 5e742107: am c4afc192: Merge "Add SIGTRAP support to crasher and debuggerd."
* commit '5e7421073243337075975ecf762ae084765fdb5f':
  Add SIGTRAP support to crasher and debuggerd.
2014-05-17 00:46:11 +00:00
Elliott Hughes
5e74210732 am c4afc192: Merge "Add SIGTRAP support to crasher and debuggerd."
* commit 'c4afc19236ae7253acc3266b4ca8515473e9c7cc':
  Add SIGTRAP support to crasher and debuggerd.
2014-05-17 00:42:36 +00:00
Elliott Hughes
c4afc19236 Merge "Add SIGTRAP support to crasher and debuggerd." 2014-05-17 00:39:22 +00:00
Elliott Hughes
7e35ae8fc8 Add SIGTRAP support to crasher and debuggerd.
Bug: 15024256
Change-Id: I3f34993fcfd9799306852b0a2195db468370be6e
2014-05-16 17:27:59 -07:00
Colin Cross
f630960088 am 3277dc26: am 2d03a498: Merge "correct the setenv option judging condition"
* commit '3277dc269820e4d8785ea46d6a196145e7c88b78':
  correct the setenv option judging condition
2014-05-16 20:51:15 +00:00
Colin Cross
3277dc2698 am 2d03a498: Merge "correct the setenv option judging condition"
* commit '2d03a498f9a1258740a9bbf6b28882506cde3ad9':
  correct the setenv option judging condition
2014-05-16 20:49:37 +00:00
Colin Cross
2d03a498f9 Merge "correct the setenv option judging condition" 2014-05-16 20:47:15 +00:00
Gavin.Chang
c3a4676c7f correct the setenv option judging condition
Change-Id: I10ed6275374f572da639f26611f607bf7607905c
2014-05-16 20:46:58 +00:00
Mark Salyzyn
f742788ab8 am 24786645: am bc741ac2: Merge "logd: logcat: debuggerd: auditd logs to events"
* commit '24786645d68f76e6dbc9b83c4a113ff53b3c62ad':
  logd: logcat: debuggerd: auditd logs to events
2014-05-16 20:40:17 +00:00
Mark Salyzyn
24786645d6 am bc741ac2: Merge "logd: logcat: debuggerd: auditd logs to events"
* commit 'bc741ac2126727d9de33042fa308307690efe13f':
  logd: logcat: debuggerd: auditd logs to events
2014-05-16 20:36:33 +00:00
Mark Salyzyn
bc741ac212 Merge "logd: logcat: debuggerd: auditd logs to events" 2014-05-16 20:34:18 +00:00
Mark Salyzyn
88a981497a am 13ee94c5: am 8b2d46a5: Merge "init: logd: Allow Developer settings to adjust logd size"
* commit '13ee94c5106a11bf74d485062115af8cf8d77fe3':
  init: logd: Allow Developer settings to adjust logd size
2014-05-16 00:34:10 +00:00
Mark Salyzyn
13ee94c510 am 8b2d46a5: Merge "init: logd: Allow Developer settings to adjust logd size"
* commit '8b2d46a5fcbe81edde4b7c405916282a142a09d2':
  init: logd: Allow Developer settings to adjust logd size
2014-05-16 00:30:23 +00:00
Mark Salyzyn
8b2d46a5fc Merge "init: logd: Allow Developer settings to adjust logd size" 2014-05-16 00:27:08 +00:00
Greg Hackmann
dc17deaa1a am 891a3919: am b4ad6911: Merge "libadf: silence false positive warning"
* commit '891a391951575c68eca793ff7f1bc05d4a102deb':
  libadf: silence false positive warning
2014-05-15 22:51:46 +00:00
Greg Hackmann
891a391951 am b4ad6911: Merge "libadf: silence false positive warning"
* commit 'b4ad6911a4e88ae5c8f8f0249cae8071a783e01c':
  libadf: silence false positive warning
2014-05-15 22:49:00 +00:00
Greg Hackmann
b4ad6911a4 Merge "libadf: silence false positive warning" 2014-05-15 22:45:10 +00:00
Mark Salyzyn
989980c55d logd: logcat: debuggerd: auditd logs to events
- 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
2014-05-15 08:50:50 -07:00
Narayan Kamath
08a1507603 am a5f7aca8: am 75a8eeb1: Merge "Change app_process reference to app_process32."
* commit 'a5f7aca82e63942e9449804fd11eb11aec710419':
  Change app_process reference to app_process32.
2014-05-15 09:45:29 +00:00
Narayan Kamath
a5f7aca82e am 75a8eeb1: Merge "Change app_process reference to app_process32."
* commit '75a8eeb1ecf9f748b1d53e5ff3a5e138a0cdbebd':
  Change app_process reference to app_process32.
2014-05-15 09:41:36 +00:00
Narayan Kamath
75a8eeb1ec Merge "Change app_process reference to app_process32." 2014-05-15 09:36:33 +00:00
Narayan Kamath
b3bd09cda0 am 9cbc8088: am 5f6beb12: Merge ""stop" / "start must apply to the secondary zygote as well."
* commit '9cbc808827950ae70b2a0bb9cb92f30fd1fbc724':
  "stop" / "start must apply to the secondary zygote as well.
2014-05-15 09:20:27 +00:00
Narayan Kamath
9cbc808827 am 5f6beb12: Merge ""stop" / "start must apply to the secondary zygote as well."
* commit '5f6beb12c1b66d6fbcebd86383f29337674ac75c':
  "stop" / "start must apply to the secondary zygote as well.
2014-05-15 09:18:15 +00:00
Narayan Kamath
5f6beb12c1 Merge ""stop" / "start must apply to the secondary zygote as well." 2014-05-15 09:15:52 +00:00
Kenny Root
101e92acf1 am 020f81bf: am d20ba7fc: Merge "ps: add flag to show ABI"
* commit '020f81bf1270bfa72167e3c358abf33bb60778a5':
  ps: add flag to show ABI
2014-05-15 00:11:09 +00:00
Kenny Root
020f81bf12 am d20ba7fc: Merge "ps: add flag to show ABI"
* commit 'd20ba7fca295453648bc9093db03c16efbc6df1b':
  ps: add flag to show ABI
2014-05-15 00:08:40 +00:00
Elliott Hughes
7c633e6fe6 am 233bbd9d: am ed02fbf0: Merge "Clean up some unnecessary system_properties cruft."
* commit '233bbd9d515d16131d2e713e6909d992d27b8ef9':
  Clean up some unnecessary system_properties cruft.
2014-05-15 00:04:04 +00:00
Kenny Root
d20ba7fca2 Merge "ps: add flag to show ABI" 2014-05-15 00:03:41 +00:00
Elliott Hughes
233bbd9d51 am ed02fbf0: Merge "Clean up some unnecessary system_properties cruft."
* commit 'ed02fbf05c21442f40407bfaefcca35b985ad66a':
  Clean up some unnecessary system_properties cruft.
2014-05-15 00:01:53 +00:00
Elliott Hughes
ed02fbf05c Merge "Clean up some unnecessary system_properties cruft." 2014-05-14 23:59:27 +00:00
Elliott Hughes
f94853f294 Clean up some unnecessary system_properties cruft.
Bug: 14970171
Change-Id: I6f54c35e265b849be914120f795c9f8e0cec34bb
2014-05-14 16:51:09 -07:00
Kenny Root
8f197e6579 ps: add flag to show ABI
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
2014-05-14 16:11:37 -07:00
Sreeram Ramachandran
8f1c82c697 am 56935417: am f03397fa: Merge changes If5359c26,I5d09be41
* commit '56935417ceac36ea411b1489e08fec64d188bd79':
  Use a function instead of a macro.
  Mark sockets on accept().
2014-05-14 19:51:38 +00:00
Sreeram Ramachandran
5bd06936e7 am 07a1b526: am 75161485: Merge "Introduce netd_client, a dynamic library that talks to netd."
* commit '07a1b526ae36368293909b6c3ee7d5f18b89a2a7':
  Introduce netd_client, a dynamic library that talks to netd.
2014-05-14 19:51:38 +00:00
Sreeram Ramachandran
066c9b5a00 am 9743f097: am 09eaad79: Merge "Introduce fwmarkd: a service to set the fwmark of sockets."
* commit '9743f09724162186fb280627c3c125a55534a219':
  Introduce fwmarkd: a service to set the fwmark of sockets.
2014-05-14 19:51:37 +00:00
Sreeram Ramachandran
56935417ce am f03397fa: Merge changes If5359c26,I5d09be41
* commit 'f03397fad4430742d85579fc7a80224ed6e6fb2a':
  Use a function instead of a macro.
  Mark sockets on accept().
2014-05-14 19:48:12 +00:00
Sreeram Ramachandran
07a1b526ae am 75161485: Merge "Introduce netd_client, a dynamic library that talks to netd."
* commit '751614859763c8846f4e98d2a0694a5d93fcd97e':
  Introduce netd_client, a dynamic library that talks to netd.
2014-05-14 19:48:11 +00:00
Sreeram Ramachandran
9743f09724 am 09eaad79: Merge "Introduce fwmarkd: a service to set the fwmark of sockets."
* commit '09eaad793a8cec9196255d740ecb89a1426c0bf7':
  Introduce fwmarkd: a service to set the fwmark of sockets.
2014-05-14 19:48:10 +00:00
Sreeram Ramachandran
f03397fad4 Merge changes If5359c26,I5d09be41
* changes:
  Use a function instead of a macro.
  Mark sockets on accept().
2014-05-14 19:41:45 +00:00
Sreeram Ramachandran
7516148597 Merge "Introduce netd_client, a dynamic library that talks to netd." 2014-05-14 19:41:39 +00:00
Sreeram Ramachandran
09eaad793a Merge "Introduce fwmarkd: a service to set the fwmark of sockets." 2014-05-14 19:41:33 +00:00
Sreeram Ramachandran
6af621f792 Use a function instead of a macro.
(cherry picked from commit f3e4a8bb245afe874561eb7275f49dae0e7e55dd)

Change-Id: If5359c26a1474de0c278193fd2f09168f3184dee
2014-05-14 11:15:20 -07:00
Sreeram Ramachandran
b87b17a895 Mark sockets on accept().
(cherry picked from commit 1321cfecc6fb0e075796a34ed3c6a30d7ff3bea3)

Change-Id: I5d09be413cf720fbed905f96313b007997ada76c
2014-05-14 11:14:41 -07:00
Sreeram Ramachandran
154ebe80a0 Introduce netd_client, a dynamic library that talks to netd.
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
2014-05-14 11:13:53 -07:00
Mark Salyzyn
12d9b8272d am 4f801e60: am 3fe8afa4: Merge "fastboot: turn on -Werror"
* commit '4f801e60e309c34ef678c687160e2841432ebee5':
  fastboot: turn on -Werror
2014-05-14 18:12:53 +00:00
Mark Salyzyn
6bcab9f080 am ddf516f8: am 506a536b: Merge "libzipfile: turn on -Werror"
* commit 'ddf516f864c0a38be3717990216533ba49e9e3fd':
  libzipfile: turn on -Werror
2014-05-14 18:12:52 +00:00
Sreeram Ramachandran
e38d470714 Introduce fwmarkd: a service to set the fwmark of sockets.
(cherry picked from commit d5121e212c1f53b1cb6458ee83be892d94fdfef3)

Change-Id: Ieb049fe34ea2b21a7f6108f2099d1a8b8f2c28f7
2014-05-14 11:12:42 -07:00
Mark Salyzyn
4f801e60e3 am 3fe8afa4: Merge "fastboot: turn on -Werror"
* commit '3fe8afa404a4317807c7116fdab40f2506713396':
  fastboot: turn on -Werror
2014-05-14 18:07:32 +00:00
Mark Salyzyn
ddf516f864 am 506a536b: Merge "libzipfile: turn on -Werror"
* commit '506a536b1ed5a6e2deacfa039a7c274d4436e682':
  libzipfile: turn on -Werror
2014-05-14 18:07:31 +00:00
Mark Salyzyn
3fe8afa404 Merge "fastboot: turn on -Werror" 2014-05-14 18:04:11 +00:00