Commit graph

18776 commits

Author SHA1 Message Date
Todd Poynor
5fc82ef714 Merge "metrics_collector: add libmetricscollectorservice binder service" 2015-12-10 22:25:19 +00: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
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
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.

Bug: 26132185
Change-Id: Ib7c2f9e696f52bf5bbb79223d90dd76791779587
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
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
59e5c25919 Merge "metricsd binder: Abort if fail to register service" 2015-12-10 19:32:03 +00: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
Dimitry Ivanov
028aa205af Merge "Apply permitted path to the classloader-namespace" 2015-12-10 04:34:38 +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
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
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
Josh Gao
ce8f2cdcd0 adb: make the test_pull_dir test actually test something.
Change-Id: I8b525377557528d5bc70c44d587891fad9f739bd
2015-12-09 14:41:33 -08:00
Alex Vakulenko
919af692c5 Merge "metricsd: Update to use new component/trait APIs from weaved" 2015-12-09 22:11:09 +00:00
Todd Poynor
2862a7843d metricsd binder: Abort if fail to register service
Assert abort metricsd if binder service registration fails.

If the addService() call fails (for reasons that at least include an SELinux
policy denial), the call to joinThreadPool() apparently processes a stale
pending weak dereference that triggers an abort on a probable double-free:

 F libc    : Invalid address 0xbe8bfa30 passed to free: value not allocated
 F libc    : Fatal signal 6 (SIGABRT), code -6 in tid 609 (metricsd)

Since metricsd is severely hobbled if registration fails, abort and see if
things work better the next time.  If not, the crash loop will hopefully
attract attention to the problem.

Change-Id: I520d0eafb9cb25ee225d589bfd87df4e51f6b181
2015-12-09 13:32:37 -08:00
Alex Vakulenko
9fc597b750 metricsd: Update to use new component/trait APIs from weaved
Removed command and state definitions and use trait definitions
instead. Also, create "metrics" component for weave.

BUG: 25916429, 25916428, 25917426

Change-Id: Icc02d1c46c371d3afa8e4723852f182992c62bf2
2015-12-09 12:35:39 -08:00
Tao Bao
df13f60ce0 Merge "rootdir: Execute update_verifier for A/B update." 2015-12-09 19:50:31 +00:00
Josh Gao
191c154832 Move adb tests to system/core/adb.
Change-Id: If240f45817a46d1e055a8e5173ee7191b9d6c8ea
2015-12-09 11:26:11 -08:00
Yabin Cui
b6345d6efa Merge "libbacktrace: check if elf file paths are valid before reading them." 2015-12-09 18:26:15 +00:00
Sami Tolvanen
85abb0860e Merge "init: set ro.boot.flash.locked from ro.boot.verifiedbootstate" 2015-12-09 16:00:00 +00:00
Sami Tolvanen
9e9efcadc5 init: set ro.boot.flash.locked from ro.boot.verifiedbootstate
If ro.oem_unlock_supported is specified for the device and it supports
verified boot, export lock status in ro.boot.flash.locked.

Bug: 26039090
Change-Id: Ie7844aeb458c97944c72d46ea962b9cfb0a7875d
2015-12-09 10:09:11 +00:00
Yabin Cui
2ad59db75f libbacktrace: check if elf file paths are valid before reading them.
Bug: 25194400
Change-Id: If6e60585673226392d38fab9ad14bd7b94261316
2015-12-08 19:22:29 -08:00
Alex Vakulenko
9729392ffa Merge "metricsd: Remove unused type declarations" 2015-12-09 01:32:43 +00:00
Alex Vakulenko
4840ab74b5 metricsd: Remove unused type declarations
BUG: 26092352
Change-Id: If0dda4c171a2b62291693db49c1e16499fc10f5a
2015-12-08 17:13:32 -08:00
Mark Salyzyn
cb3e6ef154 Merge "liblog: Build Problem, BOOLEAN" 2015-12-09 00:04:53 +00:00
Mark Salyzyn
b004a7fe6f liblog: Build Problem, BOOLEAN
Checks with BOOLEAN_FALSE and BOOLEAN_TRUE should be made
against an unsigned char.

Bug: 26029733
Change-Id: I405f45a4d6ddae1b060b0e8da9c1585298abe8bd
2015-12-08 15:24:44 -08:00
Mark Salyzyn
1631d36d95 Merge "liblog: Add __android_log_security()" 2015-12-08 21:55:56 +00:00
Steve Fung
ec5b7d4b6c Merge "crash_reporter: Fix unit tests" 2015-12-08 21:46:53 +00:00
Tom Cherry
93f82d0897 Merge "Remove property_area_initialized" 2015-12-08 21:03:05 +00:00
Mark Salyzyn
ffbd86ff25 liblog: Add __android_log_security()
Return non-zero if ro.device_owner is set and not false
and persist.logd.security is true.

Bug: 26029733
Change-Id: Ie82ae11ae35e9c79017b6e873fefb39d79a1d4fe
2015-12-08 11:28:27 -08:00
Elliott Hughes
4ab13d0256 Merge "Track rename of base/ to android-base/." 2015-12-08 18:45:15 +00:00
Elliott Hughes
8b0471462e Track rename of base/ to android-base/.
Change-Id: I974d67b6568e913bfb7700d952be55b4073388ee
2015-12-08 10:38:59 -08:00
Yabin Cui
bfdc099650 Merge "Fix libbacktrace host build." 2015-12-08 18:26:18 +00:00
David Pursell
e37325defc Merge "adb: add help text for USB permission errors."
am: 663e949b2b

* commit '663e949b2bbda5dcc2b92e4d1936555019cdd66b':
  adb: add help text for USB permission errors.
2015-12-08 16:16:16 +00:00
David Pursell
663e949b2b Merge "adb: add help text for USB permission errors." 2015-12-08 16:12:22 +00:00
Elliott Hughes
a77731e14d Merge "Rename base/ to android-base/."
am: 5986d9f263

* commit '5986d9f263d08ef8876656098cbe95b59d310f21':
  Rename base/ to android-base/.
2015-12-08 16:06:06 +00:00
Elliott Hughes
5986d9f263 Merge "Rename base/ to android-base/." 2015-12-08 16:02:53 +00:00
Erik Kline
f6df8fce6d Merge "Listen on dualstack sockets."
am: 1f7bcf3e93

* commit '1f7bcf3e93349bbb067f12296c0e17cf64d30e89':
  Listen on dualstack sockets.
2015-12-07 22:31:40 -08:00
Erik Kline
1f7bcf3e93 Merge "Listen on dualstack sockets." 2015-12-08 06:28:29 +00:00
Nick Kralevich
65ab87dd9b Merge "adb: Make HOME=/data/local/tmp"
am: 5358093225

* commit '53580932250c9f3ba4a052c9fe31aa1de7bf411d':
  adb: Make HOME=/data/local/tmp
2015-12-08 05:00:16 +00:00
Nick Kralevich
5358093225 Merge "adb: Make HOME=/data/local/tmp" 2015-12-08 04:56:05 +00:00
Nick Kralevich
070288241d Merge "init.rc: restorecon_recursive /sys/kernel/debug"
am: 6d85c06aa1

* commit '6d85c06aa1600e905cf3e0b093e939fa3866ee59':
  init.rc: restorecon_recursive /sys/kernel/debug
2015-12-08 04:48:06 +00:00
Nick Kralevich
6d85c06aa1 Merge "init.rc: restorecon_recursive /sys/kernel/debug" 2015-12-08 04:44:08 +00:00