James Hawkins
c1b10a9e84
Merge "Revert "Revert "bootstat: Handle v1 record files which do not contain file contents.""" into nyc-dev
2016-03-28 20:59:19 +00:00
James Hawkins
a55a05a9ed
Merge "bootstat: Handle v1 record files which do not contain file contents." into nyc-dev
...
am: c52b70d
-s ours
* commit 'c52b70d289e9eed81269deeca4d812aaf116069e':
bootstat: Handle v1 record files which do not contain file contents.
2016-03-28 20:57:14 +00:00
Dan Austin
a27bbd2728
Fix const issues in preparation for libcxx rebase.
...
Change-Id: Id57474eb63334873ee5383f61eb918941dbb0984
2016-03-28 13:43:15 -07:00
James Hawkins
6105846a0e
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
(cherry picked from commit c0dc139b4a
)
2016-03-28 13:37:16 -07:00
Pablo Ceballos
0e28c1fa4a
Merge "Rename single buffer mode to shared buffer mode" into nyc-dev
2016-03-28 19:34:27 +00:00
Elliott Hughes
2c5d1d7cd9
Add operator int() to unique_fd.
...
Change-Id: I7512559be7befbb8772d5529e06550267a2f1543
2016-03-28 12:15:36 -07:00
James Hawkins
197b62852b
Merge "Revert "bootstat: Handle v1 record files which do not contain file contents."" into nyc-dev
2016-03-28 18:29:36 +00:00
James Hawkins
77fc4bac4e
Revert "bootstat: Handle v1 record files which do not contain file contents."
...
This reverts commit 13b42bf8a8
.
I accidentally merged the wrong version of this change (this version had to be reverted on master).
Change-Id: I651e3bf50515daed08464a49ace2eefefdad89c0
2016-03-28 18:25:41 +00:00
James Hawkins
c52b70d289
Merge "bootstat: Handle v1 record files which do not contain file contents." into nyc-dev
2016-03-28 17:27:17 +00: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
9c965d74e5
Merge "Fix <android-base/*.h> header guards."
...
am: 3761365
* commit '3761365735de4cbc3c8581f0a5e972ad01f8378c':
Fix <android-base/*.h> header guards.
2016-03-26 16:48:24 +00:00
Elliott Hughes
dc1d81b316
Merge "Copy the good comment and warn_unused_result from ScopedFd to unique_fd."
...
am: 19388fc
* commit '19388fc312baa6898c370365699d7b54f76c17d1':
Copy the good comment and warn_unused_result from ScopedFd to unique_fd.
2016-03-26 16:48:24 +00: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
Josh Gao
dac593937f
debuggerd: add SIGSYS to the list of handled signals.
...
am: dfa163d
* commit 'dfa163df500ca71b71be315aa55e8859c946d0fb':
debuggerd: add SIGSYS to the list of handled signals.
2016-03-26 01:16:25 +00:00
James Hawkins
34c081cf3e
Merge "Revert "Revert "bootstat: Handle v1 record files which do not contain file contents."""
...
am: 68af348
* commit '68af3483126e99df92334e29b8b096eca32d9d5b':
Revert "Revert "bootstat: Handle v1 record files which do not contain file contents.""
2016-03-25 22:15:50 +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
21caa750b6
Merge changes Ie52ddf30,Idfa637f6
...
am: 5c8b99d
* commit '5c8b99da1a58c5776166c3b4972e902b943fe057':
logcat: Add --max-count option
logcat: Add --regex option
2016-03-25 21:51:52 +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
Josh Gao
dfa163df50
debuggerd: add SIGSYS to the list of handled signals.
...
Processes using seccomp will get SIGSYS when attempting to use a
disallowed syscall. We're currently not handling SIGSYS in bionic's
signal handler, but this change will let us dump a backtrace pointing at
rt_tgsigqueueinfo in our signal handler if seccomp policies block it
during a real crash.
Bug: http://b/27853687
Change-Id: I4e4aacc95eeef7249d895e19dc4ccd77a51c7a17
2016-03-25 14:34:22 -07: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
f08a16087e
Merge "Revert "bootstat: Handle v1 record files which do not contain file contents.""
...
am: 5d47ab5
* commit '5d47ab5a3ae483246c580baf943fe63121691b83':
Revert "bootstat: Handle v1 record files which do not contain file contents."
2016-03-25 20:07:53 +00:00
Mark Salyzyn
cca6f20341
Merge "liblog: update Android.bp" into nyc-dev
...
am: 033bc9f
* commit '033bc9f3e7175ece714c13258c2385d503c35dc8':
liblog: update Android.bp
2016-03-25 19:59:25 +00:00
Colin Cross
033bc9f3e7
Merge "liblog: update Android.bp" into nyc-dev
2016-03-25 19:54:24 +00:00
Daniel Cashman
2a1c430ff4
Merge "Revert "Set mmap_rnd_bits to maximum value.""
...
am: bb296fd
* commit 'bb296fdaecb3c90c21797dab6abb3add4f84d938':
Revert "Set mmap_rnd_bits to maximum value."
2016-03-25 18:48:14 +00: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
James Hawkins
6574be5a7c
Merge "bootstat: Handle v1 record files which do not contain file contents."
...
am: 593ea57
* commit '593ea575533e3a9af4ded84d7d2708bbc62da687':
bootstat: Handle v1 record files which do not contain file contents.
2016-03-25 18:03:30 +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
13b42bf8a8
bootstat: Handle v1 record files which do not contain file contents.
...
Bug: 27836969
Change-Id: I18fcdab7ca32d00af3f8827f42d47868492ed719
(cherry picked from commit 84fda19c83
)
2016-03-25 10:42:50 -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
1b245719f1
Merge "fastboot: Minor fix to help text."
...
am: 92a7043
* commit '92a70439d6767f577546ccf7baf215b113265ae0':
fastboot: Minor fix to help text.
2016-03-25 04:49:37 +00: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
Joe Onorato
f0fa9f3608
Merge "Turn off duplicate log" into nyc-dev
...
am: e0e941e
* commit 'e0e941e34931990e230994fcb5a89ec41f6d5715':
Turn off duplicate log
2016-03-24 23:34:07 +00:00
Joe Onorato
e0e941e349
Merge "Turn off duplicate log" into nyc-dev
2016-03-24 23:19:55 +00:00
Dan Stoza
42d5a1f941
Merge "graphics.h: Add android_color_transform_t" into nyc-dev
...
am: beda52b
* commit 'beda52b32a0c324ba54b67e52e4714c2cd303070':
graphics.h: Add android_color_transform_t
2016-03-24 22:41:01 +00:00
Dan Stoza
beda52b32a
Merge "graphics.h: Add android_color_transform_t" into nyc-dev
2016-03-24 21:44:38 +00:00
Mark Salyzyn
93101bea8b
liblog: update Android.bp
...
Update Android.bp to match the version in AOSP.
Change-Id: I93aba0f93a7a8d255073661331f1d966a53e20aa
(cherry picked from commit c457a4b73e
)
2016-03-24 13:45:00 -07:00
Mark Salyzyn
fc18abb716
Merge "liblog: logprint: deal with malformed log messages"
...
am: abdb758
* commit 'abdb758ef63d79b5b893838d22598bd5924f8f9d':
liblog: logprint: deal with malformed log messages
2016-03-24 19:28:12 +00:00
Mark Salyzyn
128c0f7081
liblog: logprint: deal with malformed log messages
...
am: 476b771
* commit '476b771bdaebf7aa72d41730557fce82cee7faf3':
liblog: logprint: deal with malformed log messages
2016-03-24 19:25:32 +00:00
Mark Salyzyn
476b771bda
liblog: logprint: deal with malformed log messages
...
(cherry picked from commit 083c53462a
)
Try to print as much content as possible should the application
logging only submit content as part of a tag with an empty message.
We search for the first non-printable ascii character in the tag, in
order to split it up for printing.
Applications (such as com.yahoo.mobile.client.android.weather) that
malform their log messages will no longer be punished by truncating
the content, but this should never be considered advocacy for their
bad behavior.
Bug: 27585978
Change-Id: Idb0680e8d6a6ad2bef5150661905acccb5b70afb
2016-03-24 12:21:53 -07:00
Mark Salyzyn
abdb758ef6
Merge "liblog: logprint: deal with malformed log messages"
2016-03-24 19:20:29 +00:00
Joe Onorato
b03b6ac61e
Turn off duplicate log
...
Bug: 27744135
Change-Id: Iaf5787d36c983f19586e1d1a40f35091fb168cfe
2016-03-24 11:33:15 -07:00
Dan Stoza
bb1deda59b
graphics.h: Add android_color_transform_t
...
Adds android_color_transform_t, which specifies a range of color
transforms which may be applied to the whole display.
Bug: 22767098
Change-Id: Iaf03915c09ac0bdd18512b5f78c39da1705bda08
2016-03-24 10:38:46 -07:00
Kees Cook
a0218d9c09
Merge "init: improve mmap ASLR failure reporting"
...
am: b27026f
* commit 'b27026f9253fd66cf85fe4ab519a6781a7cddb0b':
init: improve mmap ASLR failure reporting
2016-03-24 02:53:10 +00:00