Elliott Hughes
6aaa953ddb
Merge "Address property service DoS." am: 8d302763ab
...
am: 811971d949
2017-02-23 02:19:16 +00:00
Elliott Hughes
811971d949
Merge "Address property service DoS."
...
am: 8d302763ab
2017-02-23 02:17:16 +00:00
Treehugger Robot
8d302763ab
Merge "Address property service DoS."
2017-02-23 02:14:00 +00:00
Mark Salyzyn
9bd6e36a9f
Merge "logd: add getEventTag id= command" am: 3e3aaca4c3
...
am: b7987ce8c4
2017-02-22 23:15:13 +00:00
Mark Salyzyn
f70743f2ae
Merge "liblog: logprint followup" am: 60c77ed265
...
am: 7cb2658b26
2017-02-22 23:15:01 +00:00
Mark Salyzyn
b7987ce8c4
Merge "logd: add getEventTag id= command"
...
am: 3e3aaca4c3
2017-02-22 23:12:42 +00:00
Mark Salyzyn
7cb2658b26
Merge "liblog: logprint followup"
...
am: 60c77ed265
2017-02-22 23:12:30 +00:00
Mark Salyzyn
3e3aaca4c3
Merge "logd: add getEventTag id= command"
2017-02-22 23:09:20 +00:00
Mark Salyzyn
60c77ed265
Merge "liblog: logprint followup"
2017-02-22 23:08:02 +00:00
Elliott Hughes
b005d90816
Address property service DoS.
...
Bug: http://b/35166374
Test: ran new test
Change-Id: I94cf5750f0d2dc87f4a118b2c63b16255ef30fd2
2017-02-22 14:54:15 -08:00
Mark Salyzyn
407537f798
logd: add getEventTag id= command
...
This is the precursor for "Plan B" recovery when access to
/dev/event-log-tags is blocked to untrusted zones. Also
deals with mitigating issues with long-lived mappings that
do not update /dev/event-log-tags when dynamically changed.
Test: gTest logd-unit-test --gtest_filter=logd.getEventTag_42
Bug: 31456426
Bug: 35326290
Change-Id: I3db2e73763603727a369da3952c5ab4cf709f901
2017-02-22 14:16:31 -08:00
Mark Salyzyn
8dcd94b2cd
liblog: logprint followup
...
Add comment and braces to add maintenance clarity.
Test: gTest logcat-unit-tests
Bug: 35326290
Change-Id: Ie25b42faba19ae3cf52d4c6cefc4fc539ec23e79
2017-02-22 14:16:31 -08:00
Josh Gao
b17ca7f367
Merge "adb: remove win32 dependency on libwinpthread-1.dll." am: 1d73abb443
...
am: ef260561f3
2017-02-22 02:12:52 +00:00
Josh Gao
ef260561f3
Merge "adb: remove win32 dependency on libwinpthread-1.dll."
...
am: 1d73abb443
2017-02-22 02:10:51 +00:00
Treehugger Robot
1d73abb443
Merge "adb: remove win32 dependency on libwinpthread-1.dll."
2017-02-22 02:06:40 +00:00
Elliott Hughes
6f4e2cf604
Merge "Add timeout support to android::base::WaitForProperty." am: ff692a5ace
...
am: 6bbdfa3260
2017-02-22 01:49:57 +00:00
Elliott Hughes
6bbdfa3260
Merge "Add timeout support to android::base::WaitForProperty."
...
am: ff692a5ace
2017-02-22 01:48:00 +00:00
Treehugger Robot
ff692a5ace
Merge "Add timeout support to android::base::WaitForProperty."
2017-02-22 01:43:31 +00:00
Mark Salyzyn
a119bcc8f6
Merge "liblogcat: redirect logcat output correctly for -Q" am: 151fec4032
...
am: f2b62408b2
2017-02-22 01:29:48 +00:00
Mark Salyzyn
f2b62408b2
Merge "liblogcat: redirect logcat output correctly for -Q"
...
am: 151fec4032
2017-02-22 01:27:48 +00:00
Treehugger Robot
151fec4032
Merge "liblogcat: redirect logcat output correctly for -Q"
2017-02-22 01:23:40 +00:00
Mark Salyzyn
f9dbdbc5f5
liblogcat: redirect logcat output correctly for -Q
...
The -Q option is used in emulator and it fails to redirect the
output of logcat to the desired file.
This CL fixes that problem.
There is no gTest because of /proc/cmdline sniffing for this option.
manually tested on /dev/qemu_pipe inside emulator
Test: manual
Bug: 35326290
Change-Id: I282da685e90450aadb2a989a0517dc3b1bb6634d
2017-02-22 01:21:02 +00:00
Bin Chen
fd6496fbeb
Merge "init: minor fix to READEME.md" am: a20c678d45
...
am: 9fc353f608
2017-02-22 00:31:09 +00:00
Bin Chen
9fc353f608
Merge "init: minor fix to READEME.md"
...
am: a20c678d45
2017-02-22 00:28:10 +00:00
Treehugger Robot
a20c678d45
Merge "init: minor fix to READEME.md"
2017-02-22 00:22:28 +00:00
Josh Gao
c2e984eec8
adb: remove win32 dependency on libwinpthread-1.dll.
...
Explicitly link against the static libwinpthread.a to avoid a
dependency on the dll.
Also, make the tests link against libbase statically.
Bug: http://b/31665213
Test: wine adb.exe
Test: wine adb_test.exe
Change-Id: Ifd41afcb1756a4b9b6db12e102b4db502e73d846
2017-02-21 15:30:11 -08:00
Mark Salyzyn
3ecffa294f
Merge "liblog: Harden log_id check." am: c280143d9b
...
am: cafb1b7776
2017-02-21 23:13:04 +00:00
Mark Salyzyn
cafb1b7776
Merge "liblog: Harden log_id check."
...
am: c280143d9b
2017-02-21 23:10:58 +00:00
Mark Salyzyn
c280143d9b
Merge "liblog: Harden log_id check."
2017-02-21 23:06:34 +00:00
Jerry Zhang
dd01d2f779
Merge "adb: set max_rw to USB_FFS_BULK_SIZE explicitly" am: b63d47356a
...
am: d59b93a5f5
2017-02-21 22:59:04 +00:00
Elliott Hughes
03edc9f764
Add timeout support to android::base::WaitForProperty.
...
Bug: http://b/35201172
Test: ran tests
Change-Id: I025aa0217dc94fabf0eb076b285a84866b00e741
2017-02-21 14:57:15 -08:00
Jerry Zhang
d59b93a5f5
Merge "adb: set max_rw to USB_FFS_BULK_SIZE explicitly"
...
am: b63d47356a
2017-02-21 22:57:05 +00:00
Jerry Zhang
b63d47356a
Merge "adb: set max_rw to USB_FFS_BULK_SIZE explicitly"
2017-02-21 22:52:57 +00:00
Bin Chen
a08f002c23
init: minor fix to READEME.md
...
Change-Id: I149c2a8f2053ac4dcc61bea6fa8c57f4c7b73c9e
Signed-off-by: Bin Chen <bin.chen@linaro.org>
2017-02-22 09:38:25 +11:00
Jerry Zhang
f3fb7de3c8
adb: set max_rw to USB_FFS_BULK_SIZE explicitly
...
Sometimes when endpoint_alloc returns ENODEV,
max_rw will end up being a value that is too
big.
Bug: 35634401
Test: push/pull files
Change-Id: Iaa81a3311b1855e2a835562cdf7a46ff4399feb1
2017-02-21 14:37:07 -08:00
Mark Salyzyn
d69e801fe8
liblog: Harden log_id check.
...
Logd currently checks against LOG_ID_MAX and LOG_ID_KERNEL to
determine if a given log_id is available. liblog uses only
LOG_ID_KERNEL. While this matches with the comments in log/log_id.h
to always keep LOG_ID_KERNEL at the end it does not match with other
checks that logd makes, causing inconsistent behavior. This
inconsistency is noticable on devices that errantly rewrite
LOG_ID_MAX to not equal LOG_ID_KERNEL + 1. For log buffers with
id's greater than LOG_ID_KERNEL, liblog reports that logd is
unavailable while logd would accept the request.
The guideline is to not use buffer ids above LOG_ID_KERNEL.
This hardening change prevents an inconsistency that results if these
guidelines are not followed. Partners are urged instead to increase
LOG_ID_KERNEL locally to match their LOG_ID_MAX - 1 when they add new
local log buffers in their private builds.
Signed-off-by: Evan Ralston <eralston@amazon.com>
Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Test: compiles. no functional change
Change-Id: Icd4b12ac79c1e5cd1d8a32f67a9795797580aad5
2017-02-21 22:29:19 +00:00
Mark Salyzyn
dc5d05ba5a
Merge "liblogcat: LOCAL_C_INCLUDE_DIRS correction" am: 01815fdcc5
...
am: 88af7ccd58
2017-02-21 19:44:56 +00:00
Mark Salyzyn
88af7ccd58
Merge "liblogcat: LOCAL_C_INCLUDE_DIRS correction"
...
am: 01815fdcc5
2017-02-21 19:41:50 +00:00
Treehugger Robot
01815fdcc5
Merge "liblogcat: LOCAL_C_INCLUDE_DIRS correction"
2017-02-21 19:36:30 +00:00
Michael Wright
ba1f83d70c
Merge "Revert "Only allow system to write to existing input nodes."" am: 05009d9336
...
am: 8eef0a5dfb
2017-02-21 19:04:51 +00:00
Michael Wright
8eef0a5dfb
Merge "Revert "Only allow system to write to existing input nodes.""
...
am: 05009d9336
2017-02-21 19:02:47 +00:00
Treehugger Robot
05009d9336
Merge "Revert "Only allow system to write to existing input nodes.""
2017-02-21 18:56:05 +00:00
Mark Salyzyn
b69d774a0e
Merge changes I9494ce71,Idc14e4ad,I30de692e,Ieed3223b,I63d0667a am: ee57bbd9f8
...
am: 2a03cd7158
2017-02-21 18:10:23 +00:00
Isaac Chen
a0e845a1b6
Merge "Removed cpusets/schedboost build time dependency." am: d3f8d28db2
...
am: e60efc1b0b
2017-02-21 18:03:15 +00:00
Mark Salyzyn
2a03cd7158
Merge changes I9494ce71,Idc14e4ad,I30de692e,Ieed3223b,I63d0667a
...
am: ee57bbd9f8
2017-02-21 18:01:32 +00:00
Isaac Chen
e60efc1b0b
Merge "Removed cpusets/schedboost build time dependency."
...
am: d3f8d28db2
2017-02-21 17:52:41 +00:00
Michael Wright
14667c19cd
Revert "Only allow system to write to existing input nodes."
...
This reverts commit 344e929e6d
2017-02-21 17:12:59 +00:00
Mark Salyzyn
eb40816fb8
liblogcat: LOCAL_C_INCLUDE_DIRS correction
...
Test: compile
Bug: 35326290
Change-Id: I62b46443a6b9149577e85d4f512c3946b467a1fb
2017-02-21 08:48:29 -08:00
Mark Salyzyn
ee57bbd9f8
Merge changes I9494ce71,Idc14e4ad,I30de692e,Ieed3223b,I63d0667a
...
* changes:
liblogcat: add android_logcat_popen and android_logcat_system
liblogcat: add android_logcat_run_command_thread
logcat: Create liblogcat
logcat: Use std::string instead of large static buffer for -Q
logcat: Add coding style
2017-02-21 15:35:01 +00:00
Isaac Chen
d3f8d28db2
Merge "Removed cpusets/schedboost build time dependency."
2017-02-21 02:05:24 +00:00
