Mark Salyzyn
f44cb4c6cb
Merge "liblog: gate write on log id available"
...
am: fbdbf10
* commit 'fbdbf100cb48f18d308c96f1959945cf7d1909ec':
liblog: gate write on log id available
Change-Id: Ia715fa8f520a9f7893c07a06eca4cacd2962e9cb
2016-03-29 19:57:53 +00:00
Mark Salyzyn
fbdbf100cb
Merge "liblog: gate write on log id available"
2016-03-29 19:52:32 +00:00
Mark Salyzyn
c33103c440
liblog: gate write on log id available
...
- Secure LOG_ID_KERNEL in writer
- Secure LOG_ID_SECURITY in reader and writer
- if writer transport says not available, do not write to that log id
Bug: 27566046
Bug: 27896341
Change-Id: If63a78a56fb94adfbf9979454c4cadb81af45c19
2016-03-29 12:29:04 -07:00
Yabin Cui
f63704ed5a
Merge "libbacktrace_offline: support unwinding of shared libraries in apk file."
...
am: d8c88fc
* commit 'd8c88fc5e339105cca3d207826675fdf95bfadc9':
libbacktrace_offline: support unwinding of shared libraries in apk file.
Change-Id: I7228b3a902ebd1128fbae4cd754eb7f8945eedbd
2016-03-29 18:24:10 +00:00
Yabin Cui
d8c88fc5e3
Merge "libbacktrace_offline: support unwinding of shared libraries in apk file."
2016-03-29 18:18:47 +00:00
Elliott Hughes
fabe534ecf
Merge "Add operator int() to unique_fd."
...
am: c8e179c
* commit 'c8e179c09466d392a52b6276e6dd62b4334a9a0f':
Add operator int() to unique_fd.
Change-Id: I4fd9abc29990fa5ba27de62b96237fa7c6b6b49f
2016-03-29 15:23:23 +00:00
Elliott Hughes
c8e179c094
Merge "Add operator int() to unique_fd."
2016-03-29 15:15:35 +00:00
Dan Austin
7f84a0700c
Merge "Address const issues in preparation for libcxx rebase."
2016-03-28 22:35:51 +00:00
Dan Austin
dce9b61d25
Merge "Fix const issues in preparation for libcxx rebase."
2016-03-28 21:41:10 +00:00
Dan Austin
60b976db85
Address const issues in preparation for libcxx rebase.
...
Change-Id: If9bf6c3ee57c3476a5661401853506551e2150cb
2016-03-28 14:22:12 -07:00
Dan Austin
a27bbd2728
Fix const issues in preparation for libcxx rebase.
...
Change-Id: Id57474eb63334873ee5383f61eb918941dbb0984
2016-03-28 13:43:15 -07:00
Elliott Hughes
2c5d1d7cd9
Add operator int() to unique_fd.
...
Change-Id: I7512559be7befbb8772d5529e06550267a2f1543
2016-03-28 12:15:36 -07:00
Yabin Cui
b791a76ed7
libbacktrace_offline: support unwinding of shared libraries in apk file.
...
Bug: 26962895
Change-Id: I009080f26e7323247c3ab24eea614eec4432ca6a
2016-03-26 16:06:23 -07:00
Elliott Hughes
3761365735
Merge "Fix <android-base/*.h> header guards."
2016-03-26 16:08:59 +00:00
Elliott Hughes
19388fc312
Merge "Copy the good comment and warn_unused_result from ScopedFd to unique_fd."
2016-03-26 15:53:20 +00:00
James Hawkins
68af348312
Merge "Revert "Revert "bootstat: Handle v1 record files which do not contain file contents."""
2016-03-25 22:06:10 +00:00
Casey Dahlin
5c8b99da1a
Merge changes Ie52ddf30,Idfa637f6
...
* changes:
logcat: Add --max-count option
logcat: Add --regex option
2016-03-25 21:41:27 +00:00
James Hawkins
c0dc139b4a
Revert "Revert "bootstat: Handle v1 record files which do not contain file contents.""
...
This reverts commit 756b6a53a7
.
The change is updated to use utimes (instead of futimens) since only
support for seconds resolution is required.
Bug: 27836969
Change-Id: I7134f759fb643e1a149158fcf6e20f76538b57d3
2016-03-25 14:26:13 -07:00
Casey Dahlin
6ac498d4bb
logcat: Add --max-count option
...
This new option causes logcat to quit after it prints N messages.
Test: New unit test passes
Bug: 27706081
Change-Id: Ie52ddf300160a041e68a6bac0ae7ade68bb28a7c
2016-03-25 13:55:29 -07:00
Casey Dahlin
dc42a8734e
logcat: Add --regex option
...
You can now filter log output by a regex on the messages.
Test: New unit test passes
Bug: 27706081
Change-Id: Idfa637f62a25fb1b92e9b49b89572dff0fec6e08
2016-03-25 13:55:29 -07:00
James Hawkins
5d47ab5a3a
Merge "Revert "bootstat: Handle v1 record files which do not contain file contents.""
2016-03-25 18:24:37 +00:00
James Hawkins
756b6a53a7
Revert "bootstat: Handle v1 record files which do not contain file contents."
...
Breaks the darwin-x86 build.
This reverts commit 84fda19c83
.
Change-Id: Ia55b5ba756ec2ba4195f493ea505d05f68a9c37e
2016-03-25 18:21:58 +00:00
Daniel Cashman
bb296fdaec
Merge "Revert "Set mmap_rnd_bits to maximum value.""
2016-03-25 17:50:47 +00:00
Daniel Cashman
c8f026fc9c
Revert "Set mmap_rnd_bits to maximum value."
...
Prebuilt kernels have not been updated with the requisite patches.
This reverts commit c819e78e7f
.
Change-Id: I8e63373a9b8a1e5adcb2471dfe43bde28e3f8e65
2016-03-25 10:45:20 -07:00
James Hawkins
593ea57553
Merge "bootstat: Handle v1 record files which do not contain file contents."
2016-03-25 17:23:26 +00:00
James Hawkins
84fda19c83
bootstat: Handle v1 record files which do not contain file contents.
...
Bug: 27836969
Change-Id: I18fcdab7ca32d00af3f8827f42d47868492ed719
2016-03-25 09:34:44 -07:00
Alex Deymo
92a70439d6
Merge "fastboot: Minor fix to help text."
2016-03-25 04:38:12 +00:00
Alex Deymo
f62d0cd943
fastboot: Minor fix to help text.
...
Help text had some missing end of line markers.
Bug: None
TEST=make out/host/linux-x86/bin/fastboot; fastboot
Change-Id: Iaa9e4e0a2d70c7d427f5e99e72fe1c2e2c26ee92
2016-03-24 19:51:05 -07:00
Mark Salyzyn
abdb758ef6
Merge "liblog: logprint: deal with malformed log messages"
2016-03-24 19:20:29 +00:00
Kees Cook
b27026f925
Merge "init: improve mmap ASLR failure reporting"
2016-03-24 02:44:25 +00:00
Elliott Hughes
54c72aaccc
Fix <android-base/*.h> header guards.
...
I've been meaning to do this for a while, and it came up on the bug below
that there have been conflicts with similar-named files in <base/*.h>,
so let's rule out one possible explanation.
Bug: http://b/27804373
Change-Id: I69e5d52b6260c573c308513420aee0e281426bd4
2016-03-23 15:04:52 -07:00
Elliott Hughes
c0e6e40cc9
Copy the good comment and warn_unused_result from ScopedFd to unique_fd.
...
Also list all known aliases of this class to increase the chances that
anyone searching for it by another name finds it anyway.
Change-Id: I58ea0a5421987fb69f93cc56252a771e9c34147e
2016-03-23 14:56:37 -07:00
Josh Gao
8aeabe15dd
Merge "debuggerd: waitpid for all children, and log the result."
2016-03-23 21:10:38 +00:00
Josh Gao
6e183586e3
Merge "debuggerd: always send SIGCONT after detaching."
2016-03-23 21:09:21 +00:00
Josh Gao
2808005521
debuggerd: waitpid for all children, and log the result.
...
Change-Id: Ic575e6db76ab153b4b238589a8cd299812d0e046
2016-03-23 14:07:58 -07:00
Josh Gao
24464185eb
debuggerd: always send SIGCONT after detaching.
...
Bug: http://b/27330889
Change-Id: I104248af1cde03dbdbacc03c87fe7e2dffd6c037
2016-03-23 14:07:58 -07:00
Elliott Hughes
6c03e3111d
Merge "Switch debuggerd over to unique_fd."
2016-03-23 18:36:54 +00:00
Kees Cook
39caeb5bee
init: improve mmap ASLR failure reporting
...
This should help people track down the reason for entropy setting
failures.
Bug: 27681085
Change-Id: I6bde342ca0215e32c1f851365a1723630c7d4372
2016-03-23 10:00:11 -07:00
Mattias Nissler
4c9b1494e2
Merge "Add nvram user."
2016-03-23 08:17:56 +00:00
Pierre Imai
e65f8bedec
Merge "Add C++ thread annotations support to core."
2016-03-23 03:13:22 +00:00
Elliott Hughes
ae38923c3e
Switch debuggerd over to unique_fd.
...
Change-Id: I858b9ac6a3ed47b4cc81cfe49f1ceb1e06356a03
2016-03-22 20:03:13 -07:00
Pierre Imai
021ea2d176
Add C++ thread annotations support to core.
...
Change-Id: I7b8940c12e0f3121d8c09d86d2d4077b0a0ce376
2016-03-23 11:23:28 +09:00
James Hawkins
ce8bc7b3fa
Merge "bootstat: Track record inconsistencies w/ a debug metric, bootstat_mtime_matches_content."
2016-03-23 01:22:56 +00:00
Daniel Cashman
8108b80d55
Merge "init: Fix typo."
2016-03-22 23:18:04 +00:00
dcashman
754dd9660f
init: Fix typo.
...
Bug: 27681085
Change-Id: I4308435a5b58189852c991d1bec65ed11933566a
2016-03-22 16:15:24 -07:00
James Hawkins
6f28299d0d
bootstat: Track record inconsistencies w/ a debug metric, bootstat_mtime_matches_content.
...
Fixed a file descriptor leak while I was in here.
Bug: 27550578
Change-Id: I8e252e4f5bb3c4e2ae96a1560fbb32ae636722a0
2016-03-22 16:02:01 -07:00
Daniel Cashman
4390837bf9
Merge "Temporarily add set_mmap_rnd_bits brillo exception"
2016-03-22 22:38:33 +00:00
dcashman
3396b4b665
Temporarily add set_mmap_rnd_bits brillo exception
...
(cherry-picked from internal commit: 69022e03d8
)
Bug: 27794137
Change-Id: Idc6fc1e208bdb19556173d40215feb66e235c6d6
2016-03-22 15:37:19 -07:00
Mark Salyzyn
593a5c1573
Merge changes from topic '27176738-pmsg-write-core'
...
* changes:
liblog: add __android_log_pmsg_file_read
liblog: add __android_log_pmsg_file_write
liblog: split out transports into separate files
2016-03-22 20:59:11 +00:00
Daniel Cashman
8eacf24283
Merge "Set mmap_rnd_bits to maximum value."
2016-03-22 20:21:08 +00:00