Josh Gao
412f6aaead
Merge "adb: handle some edge cases with process environments."
...
am: 80f3b0438d
2015-12-11 16:49:30 -08:00
Josh Gao
80f3b0438d
Merge "adb: handle some edge cases with process environments."
2015-12-12 00:43:38 +00:00
Josh Gao
e03c988748
adb: handle some edge cases with process environments.
...
Change-Id: I0c20e58e14ef756a8c45dd5ea85f7301157a3c8e
2015-12-11 15:58:32 -08:00
Josh Gao
7b74dc83e6
Merge "adb: don\'t use setenv after forking."
...
am: 5e15568c07
2015-12-11 15:54:37 -08:00
Josh Gao
5e15568c07
Merge "adb: don't use setenv after forking."
2015-12-11 23:32:19 +00:00
Josh Gao
9b3fd67213
adb: don't use setenv after forking.
...
Previously, for `adb shell`, we were using setenv after forking to set
up the child's environment. This would occasionally deadlock in the
child, which would cause the main thread to deadlock waiting for the
child to complete. This patch constructs the environment before forking
and passes it to execle, eliminating the deadlock.
Bug: http://b/25847115
Change-Id: I720d472770564b1449819ddaab945a89844244a8
2015-12-11 15:10:12 -08:00
Mark Salyzyn
6a92853230
Merge "liblog: logprint security ANDROID_LOG_WARN"
...
am: d2d35df279
2015-12-11 14:11:14 -08:00
Tom Cherry
80625ed1c3
Merge "Update init documentation to reflect fs_config changes"
...
am: b11afd7741
2015-12-11 14:11:07 -08:00
Mark Salyzyn
d2d35df279
Merge "liblog: logprint security ANDROID_LOG_WARN"
2015-12-11 21:43:17 +00:00
Tom Cherry
b11afd7741
Merge "Update init documentation to reflect fs_config changes"
2015-12-11 21:23:12 +00:00
Tom Cherry
dbddb40c95
Update init documentation to reflect fs_config changes
...
Change-Id: I00296d90c44af369a51ecb5cbb667567328f0053
2015-12-11 13:20:38 -08:00
Josh Gao
8b99185552
Merge "adb: make pulling symlinks and devices work."
...
am: c8e793685c
2015-12-11 13:17:53 -08:00
Josh Gao
c8e793685c
Merge "adb: make pulling symlinks and devices work."
2015-12-11 21:04:25 +00:00
Josh Gao
f264224191
adb: make pulling symlinks and devices work.
...
Bug: http://b/25972989
Bug: http://b/26085751
Change-Id: I43842871522ea5f67a8c258dcb6ddafa8dd744c8
2015-12-11 12:51:38 -08:00
Mark Salyzyn
7bc8023857
liblog: logprint security ANDROID_LOG_WARN
...
Bug: 26029733
Change-Id: I4f0cffc0a45819fb48807bf06ce336316276369d
2015-12-11 12:37:22 -08:00
Mark Salyzyn
72398c0515
Merge "logd: liblog: logcat: Add LOG_ID_SECURITY"
...
am: 86052a5d4f
2015-12-11 09:41:29 -08:00
Mark Salyzyn
86052a5d4f
Merge "logd: liblog: logcat: Add LOG_ID_SECURITY"
2015-12-11 17:33:33 +00:00
Mike Frysinger
e2d0403e1c
Merge "adbd: refactor priv dropping logic"
...
am: 6945e36060
2015-12-11 09:11:56 -08:00
Mike Frysinger
6945e36060
Merge "adbd: refactor priv dropping logic"
2015-12-11 17:03:19 +00:00
Mark Salyzyn
5afb3f5f67
Merge changes I598c8c5c,I672b0f4d,Id882978b,Idff5e080,Ib124eca1, ...
...
am: 30edbdce9b
2015-12-11 08:59:38 -08:00
Mark Salyzyn
30edbdce9b
Merge changes I598c8c5c,I672b0f4d,Id882978b,Idff5e080,Ib124eca1, ...
...
* changes:
logger.h: reduce maximum payload so sum is page size
liblog: test for maximum payload can not survive change
liblog: logprint use uid name if length less then 5
liblog: logprint add uid format modifier
liblog: readlog apps get logger_entry_v4 for pstore
logd: readlog apps get logger_entry_v4
logger.h: Add definition for logger_entry_v4
2015-12-11 16:42:28 +00:00
Mark Salyzyn
64f6251f60
Merge "logd: best 2/3 filter for timezone glitches"
...
am: ad9dac1c27
2015-12-10 15:45:09 -08:00
Mark Salyzyn
ad9dac1c27
Merge "logd: best 2/3 filter for timezone glitches"
2015-12-10 23:38:03 +00:00
Todd Poynor
6fa162fdf3
Merge "crash_reporter: use libmetricscollectorservice for user crash event reports"
...
am: f2b8cb9023
2015-12-10 14:35:55 -08:00
Todd Poynor
8e9877412b
Merge "metrics_collector: add libmetricscollectorservice binder service"
...
am: 5fc82ef714
2015-12-10 14:35:48 -08:00
Todd Poynor
f2b8cb9023
Merge "crash_reporter: use libmetricscollectorservice for user crash event reports"
2015-12-10 22:25:33 +00:00
Todd Poynor
5fc82ef714
Merge "metrics_collector: add libmetricscollectorservice binder service"
2015-12-10 22:25:19 +00:00
Josh Gao
5abed250dd
Merge "adb: shell: add -n flag to not read from stdin."
...
am: aae38d9704
2015-12-10 13:40:56 -08:00
Todd Poynor
8361935de8
crash_reporter: use libmetricscollectorservice for user crash event reports
...
Drop dependencies on D-Bus.
Bug: 25929888
Change-Id: Ie21c2feee098887ebb2dac14c866e28689e9343e
2015-12-10 13:34:10 -08:00
Todd Poynor
694553d097
metrics_collector: add libmetricscollectorservice binder service
...
Switch user crash event notification from D-Bus to this Binder service.
Add a trampoline as a go-between for the -frtti and -fno-rtti sources.
Add MetricsCollectorServiceClient for crash_reporter to use, hiding the
binder proxy details.
Remove D-Bus message filtering from metrics_collector.
Bug: 25929888
Change-Id: Idcdd60ac476340fb11602fc9afab6cd87843e529
2015-12-10 13:34:10 -08:00
Mark Salyzyn
7aa44977b5
Merge "logd: logd-reinit exits with 194"
...
am: c172d9e204
2015-12-10 13:33:28 -08:00
Josh Gao
aae38d9704
Merge "adb: shell: add -n flag to not read from stdin."
2015-12-10 21:30:19 +00:00
Mark Salyzyn
c172d9e204
Merge "logd: logd-reinit exits with 194"
2015-12-10 21:24:45 +00:00
Mark Salyzyn
b06247d9a0
logd: best 2/3 filter for timezone glitches
...
klogd is sensitive to changes in timezone resulting in glitches
surrounding conversion to local realtime logging. logger manages
a map from monotonic to realtime, but the process is racey since
the system can change the timezone at any time, this catches those
cases where it glitches.
Bug: 21868540
Change-Id: I03de6675fcd04f18ba7306a24dc3d9e750d86976
2015-12-10 13:20:48 -08:00
Nick Kralevich
a09565ad1d
Merge "Revert "adb: Make HOME=/data/local/tmp""
...
am: ce4bbcfb08
2015-12-10 12:57:48 -08:00
Josh Gao
7d58607360
adb: shell: add -n flag to not read from stdin.
...
Shell scripts of the following form do not work properly with adb:
echo "foo\nbar\nbaz" | {
read FOO
while [ "$FOO" != "" ]; do
adb shell echo $FOO
read FOO
done
}
The first run of adb shell will consume all of the contents of stdin,
causing the loop to immediately end. ssh solves this by providing a -n
flag that causes it to not read from stdin. This commit adds the same.
Bug: http://b/25817224
Change-Id: Id74ca62ef520bcf03678b50f4bf203916fd81038
2015-12-10 12:52:06 -08:00
Nick Kralevich
ce4bbcfb08
Merge "Revert "adb: Make HOME=/data/local/tmp""
2015-12-10 20:48:08 +00:00
Nick Kralevich
b118762241
Revert "adb: Make HOME=/data/local/tmp"
...
During early boot, we may be mounting and unmounting /data.
Having the home directory for adb shell commands, such as
"adb shell logcat", on the /data directory prevents unmounting.
This reverts commit 173eb396c7
2015-12-10 20:42:18 +00:00
Mark Salyzyn
f011a335f2
logd: logd-reinit exits with 194
...
Bug: 26115803
Change-Id: I6e8843ce9766756a40e6d176e0a822f62045c2af
2015-12-10 12:26:08 -08:00
Sami Tolvanen
2d4ec2e663
Merge "fs_mgr: support upstream dm-verity without error correction"
...
am: 907ec7daa7
2015-12-10 12:20:13 -08:00
Sami Tolvanen
42a86f8d1e
Merge "Set up dm-verity in EIO mode instead of logging mode"
...
am: 0d1214c68e
2015-12-10 12:20:06 -08:00
Sami Tolvanen
907ec7daa7
Merge "fs_mgr: support upstream dm-verity without error correction"
2015-12-10 20:13:02 +00:00
Sami Tolvanen
0d1214c68e
Merge "Set up dm-verity in EIO mode instead of logging mode"
2015-12-10 20:12:49 +00:00
Todd Poynor
4a90546b6f
Merge "metricsd binder: Abort if fail to register service"
...
am: 59e5c25919
2015-12-10 19:39:19 +00:00
Todd Poynor
59e5c25919
Merge "metricsd binder: Abort if fail to register service"
2015-12-10 19:32:03 +00:00
Mike Frysinger
4120ebc635
adbd: refactor priv dropping logic
...
Makes the code a little cleaner.
Change-Id: I961b6fc8730c45d8fd4f9fd2981a6d6ab8f51fb6
2015-12-10 13:35:10 -05:00
Josh Gao
e0dcc75107
Merge "adb: make the test_pull_dir test actually test something."
...
am: f31aba9e8d
2015-12-10 10:17:38 -08:00
Josh Gao
fe5c23b388
Merge "Move adb tests to system/core/adb."
...
am: 4d0e10b24e
2015-12-10 10:17:24 -08:00
Josh Gao
f31aba9e8d
Merge "adb: make the test_pull_dir test actually test something."
2015-12-10 18:09:53 +00:00
Josh Gao
4d0e10b24e
Merge "Move adb tests to system/core/adb."
2015-12-10 18:09:47 +00:00
