Commit graph

20475 commits

Author SHA1 Message Date
Mark Salyzyn
d4ac73bd6a Merge changes I598c8c5c,I672b0f4d,Id882978b,Idff5e080,Ib124eca1, ... am: 30edbdce9b
am: 5afb3f5f67

* commit '5afb3f5f678627d42ceae617069ff38d9773a005':
  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 10:57:51 -08:00
Mark Salyzyn
5afb3f5f67 Merge changes I598c8c5c,I672b0f4d,Id882978b,Idff5e080,Ib124eca1, ...
am: 30edbdce9b

* commit '30edbdce9bb5e76e02f5bdb1ee33cea2b62c7ceb':
  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 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
Daichi Hirono
db85484423 Merge "Add /mnt/appfuse mount point to init.rc." 2015-12-11 06:16:29 +00:00
Daichi Hirono
7abc71ecd3 Add /mnt/appfuse mount point to init.rc.
BUG=25755834

Change-Id: I00b1185aec7a95baa6ef2f345a49761f3d006c4d
2015-12-11 13:29:04 +09:00
Mark Salyzyn
5e664d1f77 Merge "logd: best 2/3 filter for timezone glitches" am: ad9dac1c27
am: 64f6251f60

* commit '64f6251f60475efa64a536eedfde44fe4f3ae35d':
  logd: best 2/3 filter for timezone glitches
2015-12-10 15:49:15 -08:00
Mark Salyzyn
64f6251f60 Merge "logd: best 2/3 filter for timezone glitches"
am: ad9dac1c27

* commit 'ad9dac1c2795ed28f3a011182f176d852ee269ee':
  logd: best 2/3 filter for timezone glitches
2015-12-10 15:45:09 -08:00
Todd Poynor
7223e71bcd Merge "crash_reporter: use libmetricscollectorservice for user crash event reports" am: f2b8cb9023
am: 6fa162fdf3

* commit '6fa162fdf3d8810e9ffd7642011e183a1cf55952':
  crash_reporter: use libmetricscollectorservice for user crash event reports
2015-12-10 15:43:45 -08:00
Todd Poynor
d975a0ffd2 Merge "metrics_collector: add libmetricscollectorservice binder service" am: 5fc82ef714
am: 8e9877412b

* commit '8e9877412b2dcfc1824b7c2d635f6b32e8279cd7':
  metrics_collector: add libmetricscollectorservice binder service
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

* commit '5abed250dd8a808271527c02a8c7758a863541fc':
  adb: shell: add -n flag to not read from stdin.
2015-12-10 15:43:31 -08:00
Mark Salyzyn
dccc24a2e1 Merge "logd: logd-reinit exits with 194" am: c172d9e204
am: 7aa44977b5

* commit '7aa44977b5dbed8bc1eb1376159cbe11524466b9':
  logd: logd-reinit exits with 194
2015-12-10 15:43:24 -08:00
Nick Kralevich
d1de91b26c Merge "Revert "adb: Make HOME=/data/local/tmp"" am: ce4bbcfb08
am: a09565ad1d

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

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

* commit '42a86f8d1e918356e86d4eb3fb2444a8c42d25ff':
  Set up dm-verity in EIO mode instead of logging mode
2015-12-10 15:43:02 -08:00
Todd Poynor
40e795d55d Merge "metricsd binder: Abort if fail to register service" am: 59e5c25919
am: 4a90546b6f

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

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

* commit 'fe5c23b388d1c4166558f4b3d3222f9015528afb':
  Move adb tests to system/core/adb.
2015-12-10 15:42:30 -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

* commit 'f2b8cb9023c3f41f3655e8b34a5bee40ee70b948':
  crash_reporter: use libmetricscollectorservice for user crash event reports
2015-12-10 14:35:55 -08:00
Todd Poynor
8e9877412b Merge "metrics_collector: add libmetricscollectorservice binder service"
am: 5fc82ef714

* commit '5fc82ef714a462fdceda791035fc1a9847e83458':
  metrics_collector: add libmetricscollectorservice binder service
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

* commit 'aae38d9704a6c5a2a7dfd9b628bd89822f1cbb60':
  adb: shell: add -n flag to not read from stdin.
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

* commit 'c172d9e204cc8ccb1632158059e93d06efe5563b':
  logd: logd-reinit exits with 194
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

* 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
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