Commit Graph

20502 Commits

Author SHA1 Message Date
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

* commit 'ce4bbcfb08bea39dce8c4f71da7326814edfb247':
  Revert "adb: Make HOME=/data/local/tmp"
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.

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 2d4ec2e663 Merge "fs_mgr: support upstream dm-verity without error correction"
am: 907ec7daa7

* commit '907ec7daa761624012476e540d8fe473b67b94bf':
  fs_mgr: support upstream dm-verity without error correction
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

* commit '0d1214c68ea95543468b09f7ae27bd65c8c8d7c0':
  Set up dm-verity in EIO mode instead of logging mode
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

* commit '59e5c25919e2348ef6dc01b94c9bafbfc8786633':
  metricsd binder: Abort if fail to register service
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

* commit 'f31aba9e8d976039398dbc694f7a1bd57da6e8e6':
  adb: make the test_pull_dir test actually test something.
2015-12-10 10:17:38 -08:00
Josh Gao fe5c23b388 Merge "Move adb tests to system/core/adb."
am: 4d0e10b24e

* commit '4d0e10b24e6535297424ebfe6682a1239d1a6d18':
  Move adb tests to system/core/adb.
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

* commit '584c26f872d9adfba9f5d2f200a53f837836b7bc':
  Apply permitted path to the classloader-namespace
2015-12-10 04:41:34 +00:00
Dimitry Ivanov 584c26f872 Merge "Apply permitted path to the classloader-namespace"
am: 028aa205af

* commit '028aa205af102d38ad710d31439796771fd7f708':
  Apply permitted path to the classloader-namespace
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

* commit 'ab31c07ce9a9d6df3483c326c42a50c63f737695':
  Simplify adb LinePrinter newline handling.
2015-12-09 18:53:19 -08:00
Elliott Hughes ab31c07ce9 Merge "Simplify adb LinePrinter newline handling."
am: 9fa5cefea4

* commit '9fa5cefea4bf085d686ae09a65809593300fe407':
  Simplify adb LinePrinter newline handling.
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

* commit '98a825731354791b31c91558dc46332b3ecb978d':
  fastboot: Re-add set_active as a command.
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
Alex Vakulenko c37f939fb5 Merge "metricsd: Update to use new component/trait APIs from weaved" am: 919af692c5
am: 457fcbd81f

* commit '457fcbd81fa73b626a05e833a210589255628b88':
  metricsd: Update to use new component/trait APIs from weaved
2015-12-09 22:21:21 +00:00
Alex Vakulenko 457fcbd81f Merge "metricsd: Update to use new component/trait APIs from weaved"
am: 919af692c5

* commit '919af692c58c1aab5081a3cbf48e88e744094dae':
  metricsd: Update to use new component/trait APIs from weaved
2015-12-09 22:18:55 +00: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 27ca1eb294 Merge "rootdir: Execute update_verifier for A/B update." am: df13f60ce0
am: 8ca8664956

* commit '8ca8664956bf4bce783d9b84a9f0fd0ff8a9c11f':
  rootdir: Execute update_verifier for A/B update.
2015-12-09 19:57:52 +00:00
Tao Bao 8ca8664956 Merge "rootdir: Execute update_verifier for A/B update."
am: df13f60ce0

* commit 'df13f60ce0152bc9a38e18fcb9c7c839d8eba5e3':
  rootdir: Execute update_verifier for A/B update.
2015-12-09 19:55:09 +00: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 444330270b Merge "libbacktrace: check if elf file paths are valid before reading them." am: b6345d6efa
am: e6bcd22f3e

* commit 'e6bcd22f3ed240a5d0fb39bbe90c2577a6ed7b9f':
  libbacktrace: check if elf file paths are valid before reading them.
2015-12-09 18:36:26 +00:00
Yabin Cui e6bcd22f3e Merge "libbacktrace: check if elf file paths are valid before reading them."
am: b6345d6efa

* commit 'b6345d6efa7f9026a7a3414a1dd91535d063ce93':
  libbacktrace: check if elf file paths are valid before reading them.
2015-12-09 18:33:12 +00:00
Yabin Cui b6345d6efa Merge "libbacktrace: check if elf file paths are valid before reading them." 2015-12-09 18:26:15 +00:00
Mark Salyzyn b6a8d41e2a logger.h: reduce maximum payload so sum is page size
Reduce maximum log payload so that the sum with the maximum
length header logger_entry_v4 is a page size. This is a
performance measure.

Expect side effects, truncates messages 8 bytes earlier. The
length has a long history (2008) so there may be non-C code
somewhere that has it hard-coded rather than reflecting this
header. CTS tests may need to be adjusted.

Bug: 25996918
Change-Id: I598c8c5cc78f6b0afc2c1f30cc6f3c18eb8c4c9d
2015-12-09 08:12:07 -08:00
Mark Salyzyn 42ae82742b liblog: test for maximum payload can not survive change
If we adjusted the maximum log payload, Resolve compile
issues resulting from the changes (gTest).

Bug: 25996918
Change-Id: I672b0f4d9d4a1394a5b2e27bf81a5e906bf92a10
2015-12-09 08:12:07 -08:00
Mark Salyzyn 2aa510e8b4 liblog: logprint use uid name if length less then 5
Bug: 25996918
Change-Id: Id882978b7b0b439e39bedeafc39edf80892f0317
2015-12-09 08:12:07 -08:00
Mark Salyzyn 90e7af30a5 liblog: logprint add uid format modifier
Bug: 25996918
Change-Id: Idff5e080fc5c7b69e0c45d3f596eb9d632451cbd
2015-12-09 08:12:07 -08:00