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
The Android Automerger
35131c62a4
merge in master-release history after reset to 8c56cebd44
2014-05-15 05:51:27 -07:00
Narayan Kamath
8c56cebd44
am 08a15076: am a5f7aca8: am 75a8eeb1: Merge "Change app_process reference to app_process32."
...
* commit '08a1507603d63f07cfce65ead701330e1fe89894':
Change app_process reference to app_process32.
2014-05-15 10:34:38 +00: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
50415394c5
am b3bd09cd: am 9cbc8088: am 5f6beb12: Merge ""stop" / "start must apply to the secondary zygote as well."
...
* commit 'b3bd09cda0ff29d53e91a6ec056b30a3c8b148a2':
"stop" / "start must apply to the secondary zygote as well.
2014-05-15 09:24:12 +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
7c01585339
resolved conflicts for merge of 101e92ac
to master
...
Change-Id: I837bc0732c2e72d99ce47d0534915012ff43a21e
2014-05-14 17:29:21 -07: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
Elliott Hughes
569e834602
am 7c633e6f: am 233bbd9d: am ed02fbf0: Merge "Clean up some unnecessary system_properties cruft."
...
* commit '7c633e6fe6f69006ca4299a475230dd583da38f3':
Clean up some unnecessary system_properties cruft.
2014-05-15 00:08:58 +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
d8b50fec84
am 8f1c82c6: am 56935417: am f03397fa: Merge changes If5359c26,I5d09be41
...
* commit '8f1c82c697aeb774f63153b66c45d7dea43e4dbe':
Use a function instead of a macro.
Mark sockets on accept().
2014-05-14 20:00:07 +00:00
Sreeram Ramachandran
d6f34c8aef
am 5bd06936: (-s ours) am 07a1b526: am 75161485: Merge "Introduce netd_client, a dynamic library that talks to netd."
...
* commit '5bd06936e736c1fe029e929f9d3c22b0d31e0240':
Introduce netd_client, a dynamic library that talks to netd.
2014-05-14 20:00:07 +00:00
Sreeram Ramachandran
54b0c7b431
am 066c9b5a: am 9743f097: am 09eaad79: Merge "Introduce fwmarkd: a service to set the fwmark of sockets."
...
* commit '066c9b5a005fdb84ea72a6d27a40ab5bf5e6f0e2':
Introduce fwmarkd: a service to set the fwmark of sockets.
2014-05-14 19:54:26 +00: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
Mark Salyzyn
aa907768af
toolbox: turn on -Werror
...
- Deal with some signedness issues
- Deal with some size issues
- Deal with NULL pointer issues
- Deal with some -Wunused issues
Change-Id: I1479dd90d690084491bae3475f2c547833519a57
2014-05-14 12:41:24 -07:00
Mark Salyzyn
e9272c7063
am 12d9b827: am 4f801e60: am 3fe8afa4: Merge "fastboot: turn on -Werror"
...
* commit '12d9b8272df84a270a64269888378865e3d5148e':
fastboot: turn on -Werror
2014-05-14 18:17:59 +00:00
Mark Salyzyn
27c4acee95
am 6bcab9f0: am ddf516f8: am 506a536b: Merge "libzipfile: turn on -Werror"
...
* commit '6bcab9f08020acdfc7a129fa34226ebb1d46a069':
libzipfile: turn on -Werror
2014-05-14 18:17:59 +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
Mark Salyzyn
506a536b1e
Merge "libzipfile: turn on -Werror"
2014-05-14 18:03:53 +00:00
Narayan Kamath
b4932d592f
Change app_process reference to app_process32.
...
Required due to change 5a7ee9ad63 which makes
app_process a symlink to the primary zygote.
Change-Id: I940f6302db97f74dd57112e310014e989dc586e5
2014-05-14 16:41:18 +01:00
Mark Salyzyn
5957c1ffe7
fastboot: turn on -Werror
...
- 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
2014-05-14 08:33:56 -07:00
Mark Salyzyn
ab886745bc
libzipfile: turn on -Werror
...
- resolve some unused references
Change-Id: Ia3748c7e25963c2fd3d58e175177f0f4dd405997
2014-05-14 08:33:55 -07:00
The Android Automerger
856c470192
merge in master-release history after reset to 3c1c730f20
2014-05-14 05:51:42 -07:00
Sreeram Ramachandran
d887641f64
Use a function instead of a macro.
...
Change-Id: If5359c26a1474de0c278193fd2f09168f3184dee
2014-05-14 04:12:42 -07:00