Todd Poynor
7223e71bcd
Merge "crash_reporter: use libmetricscollectorservice for user crash event reports" am: f2b8cb9023
...
am: 6fa162fdf3
2015-12-10 15:43:45 -08:00
Todd Poynor
d975a0ffd2
Merge "metrics_collector: add libmetricscollectorservice binder service" am: 5fc82ef714
...
am: 8e9877412b
2015-12-10 15:43:38 -08:00
Josh Gao
eaad29ed53
Merge "adb: shell: add -n flag to not read from stdin." am: aae38d9704
...
am: 5abed250dd
2015-12-10 15:43:31 -08:00
Mark Salyzyn
dccc24a2e1
Merge "logd: logd-reinit exits with 194" am: c172d9e204
...
am: 7aa44977b5
2015-12-10 15:43:24 -08:00
Nick Kralevich
d1de91b26c
Merge "Revert "adb: Make HOME=/data/local/tmp"" am: ce4bbcfb08
...
am: a09565ad1d
2015-12-10 15:43:17 -08:00
Sami Tolvanen
dce48bc06e
Merge "fs_mgr: support upstream dm-verity without error correction" am: 907ec7daa7
...
am: 2d4ec2e663
2015-12-10 15:43:10 -08:00
Sami Tolvanen
6401e61a6a
Merge "Set up dm-verity in EIO mode instead of logging mode" am: 0d1214c68e
...
am: 42a86f8d1e
2015-12-10 15:43:02 -08:00
Todd Poynor
40e795d55d
Merge "metricsd binder: Abort if fail to register service" am: 59e5c25919
...
am: 4a90546b6f
2015-12-10 15:42:55 -08:00
Josh Gao
0f871e8257
Merge "adb: make the test_pull_dir test actually test something." am: f31aba9e8d
...
am: e0dcc75107
2015-12-10 15:42:48 -08:00
Josh Gao
12debfc4cb
Merge "Move adb tests to system/core/adb." am: 4d0e10b24e
...
am: fe5c23b388
2015-12-10 15:42:30 -08: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
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
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
Paul Lawrence
e90233c5e6
Merge "Add createuserkey"
2015-12-10 15:10:31 +00:00
Dimitry Ivanov
fe029254e9
Merge "Apply permitted path to the classloader-namespace" am: 028aa205af
...
am: 584c26f872
2015-12-10 04:41:34 +00:00
Dimitry Ivanov
584c26f872
Merge "Apply permitted path to the classloader-namespace"
...
am: 028aa205af
2015-12-10 04:39:18 +00:00
Dimitry Ivanov
028aa205af
Merge "Apply permitted path to the classloader-namespace"
2015-12-10 04:34:38 +00:00
Elliott Hughes
ffc39903c6
Merge "Simplify adb LinePrinter newline handling." am: 9fa5cefea4
...
am: ab31c07ce9
2015-12-09 18:53:19 -08:00
Elliott Hughes
ab31c07ce9
Merge "Simplify adb LinePrinter newline handling."
...
am: 9fa5cefea4
2015-12-10 02:50:55 +00:00
Elliott Hughes
9fa5cefea4
Merge "Simplify adb LinePrinter newline handling."
2015-12-10 02:44:13 +00:00
Elliott Hughes
77f539ab49
Simplify adb LinePrinter newline handling.
...
We had mostly-working hacks before, but it's time to just modify LinePrinter
to suit our needs. If we tell LinePrinter what kind of output we're giving
it, it can manage things automatically.
This fixes the minor bug where we'd sometimes have a blank line after an
error message.
Change-Id: I07ff52437f2402de311e237dd1b2dd338d9b668a
2015-12-09 18:42:41 -08:00
Daniel Rosenberg
589500fe2e
resolve merge conflicts of b940309ec7 to master.
...
Change-Id: Icd6daa7385b8cd8c19f52dbc6805142e81b93dc9
2015-12-09 17:58:00 -08:00
Sami Tolvanen
ff980d22d1
fs_mgr: support upstream dm-verity without error correction
...
Set up dm-verity even if kernel configuration doesn't have
CONFIG_DM_VERITY_FEC set. Fall back to the always safe EIO
mode if dm-verity doesn't support feature arguments.
Bug: 21893453
Change-Id: I4812bd74801c0abc8da479230f48b752858f9cd8
2015-12-10 01:01:29 +00:00
Daniel Rosenberg
b940309ec7
Merge "fastboot: Re-add set_active as a command."
...
am: 98a8257313
2015-12-09 16:57:47 -08:00
Daniel Rosenberg
98a8257313
Merge "fastboot: Re-add set_active as a command."
2015-12-10 00:54:01 +00:00
Dimitry Ivanov
0d6e59407d
Apply permitted path to the classloader-namespace
...
Bug: http://b/25853516
Bug: http://b/22548808
Change-Id: I283e6ee8d743bc3ab41aab9f36af0abbe729943f
2015-12-09 15:39:36 -08:00
Paul Lawrence
c5733cfadb
Add createuserkey
...
Needed so we can make the user0 key on first boot
Change-Id: I4699dbf2efdec44bb09bc4cfa7eeb59e56cb93ab
2015-12-09 15:34:18 -08:00
Josh Gao
ce8f2cdcd0
adb: make the test_pull_dir test actually test something.
...
Change-Id: I8b525377557528d5bc70c44d587891fad9f739bd
2015-12-09 14:41:33 -08:00
