Commit graph

20823 commits

Author SHA1 Message Date
Alex Vakulenko
e06cdcccb1 Merge "metrics: Switch to use Binder interface to weaved" am: b50bc6b360
am: c83a5aefd6

* commit 'c83a5aefd619b8808c2c1a390ec3ad337f982a7c':
  metrics: Switch to use Binder interface to weaved
2016-01-08 21:57:04 +00:00
Alex Vakulenko
c83a5aefd6 Merge "metrics: Switch to use Binder interface to weaved"
am: b50bc6b360

* commit 'b50bc6b36007c567a097bd59f24ad1518e49923a':
  metrics: Switch to use Binder interface to weaved
2016-01-08 21:55:04 +00:00
Alex Vakulenko
b50bc6b360 Merge "metrics: Switch to use Binder interface to weaved" 2016-01-08 21:50:07 +00:00
Colin Cross
2dfa4fb571 Merge "debuggerd_test: provide stub selinux/android.h" am: 5e19382e1c
am: ce93dd6fcc

* commit 'ce93dd6fcc36de6439843472e60a0f0f3d336712':
  debuggerd_test: provide stub selinux/android.h
2016-01-08 20:57:25 +00:00
Colin Cross
51aaecea35 Merge "libinit: depend on libselinux" am: 710056efb8
am: f97f11f8c1

* commit 'f97f11f8c14e3efbd3e3840ba8ba1ea8c027e8f7':
  libinit: depend on libselinux
2016-01-08 20:57:18 +00:00
Colin Cross
ce93dd6fcc Merge "debuggerd_test: provide stub selinux/android.h"
am: 5e19382e1c

* commit '5e19382e1c585967ee07b14fbb36a8027c92c394':
  debuggerd_test: provide stub selinux/android.h
2016-01-08 20:54:20 +00:00
Bertrand Simonnet
530c8c75e2 Merge "init: Allows shutting down cleanly." am: f9f4ee8b72
am: a8c931b7f5

* commit 'a8c931b7f57c8ce74f520d591e99bb367f91dc81':
  init: Allows shutting down cleanly.
2016-01-08 20:54:11 +00:00
Colin Cross
f97f11f8c1 Merge "libinit: depend on libselinux"
am: 710056efb8

* commit '710056efb8951f6cc48e5d219ca0d561c4dafc11':
  libinit: depend on libselinux
2016-01-08 20:54:11 +00:00
Bertrand Simonnet
a8c931b7f5 Merge "init: Allows shutting down cleanly."
am: f9f4ee8b72

* commit 'f9f4ee8b720c0431669c63bd684626a0e4e9ff51':
  init: Allows shutting down cleanly.
2016-01-08 20:52:15 +00:00
Colin Cross
5e19382e1c Merge "debuggerd_test: provide stub selinux/android.h" 2016-01-08 20:49:47 +00:00
Colin Cross
710056efb8 Merge "libinit: depend on libselinux" 2016-01-08 20:49:42 +00:00
Bertrand Simonnet
f9f4ee8b72 Merge "init: Allows shutting down cleanly." 2016-01-08 20:48:34 +00:00
Bertrand SIMONNET
b7e03e82b8 init: Allows shutting down cleanly.
When ro.build.shutdown_timeout is set, init will send a SIGTERM signal to
all services on reboot. The normal shutdown process will continue once
all services have exited or after the shutdown timeout
(ro.build.shutdown_timeout).

If ro.build.shutdown_timeout is not set, we assume a 0s timeout.

Bug: 26216447
Test: manual: Ask to reboot. All services exit cleanly.

Change-Id: If921f6e8d87211e500ac9fa86f3e1eabe02d18cf
2016-01-08 11:12:15 -08:00
Elliott Hughes
06d478a5c7 Merge "init.rc: Reland "mkdir /data/misc/vold"" am: 19616ce100
am: e8b97fc0b0

* commit 'e8b97fc0b0eec1c98053cfa51db6b450657ef876':
  init.rc: Reland "mkdir /data/misc/vold"
2016-01-08 17:18:25 +00:00
Elliott Hughes
e8b97fc0b0 Merge "init.rc: Reland "mkdir /data/misc/vold""
am: 19616ce100

* commit '19616ce100771d0f570bc9cf19d08fbbe8feec0f':
  init.rc: Reland "mkdir /data/misc/vold"
2016-01-08 17:16:34 +00:00
Elliott Hughes
19616ce100 Merge "init.rc: Reland "mkdir /data/misc/vold"" 2016-01-08 17:12:53 +00:00
Yu Ning
c1149ff0c3 init.rc: Reland "mkdir /data/misc/vold"
Creation of /data/misc/vold was first introduced by commit 25775e8. It
then got reverted, probably inadvertently, by:

 commit 2e24bcfdce
 Author: Paul Lawrence <paullawrence@google.com>
 Date:   Fri May 22 18:31:55 2015 +0000

     Revert "Set up crypto for user directories in init."

This folder is required by vold. In its absence, if one tries to format
an SD card as internal storage, an error will occur, with the following
message printed to logcat:

 01-08 06:31:48.389  1002  1069 E vold    : Failed to persist key

Restoring /data/misc/vold fixes this bug.

This fix has been verified on the emulator, which currently does not
allow its virtual SD card to be adopted, but another CL will be uploaded
to enable that.

Change-Id: Ibb87ee821630a038a6f9b7b6a9da50fe03ca690d
Signed-off-by: Yu Ning <yu.ning@intel.com>
2016-01-08 14:51:32 +08:00
Alex Vakulenko
53ca76f2f3 metrics: Switch to use Binder interface to weaved
Now that weaved provides a binder interface for its IPC, switch
to using it instead.

BUG: 23782171
Change-Id: Ic3c485f99580fe41e287eaf238f033149787f181
2016-01-07 16:20:04 -08:00
Bertrand Simonnet
25f88ff7a4 Merge "Fix documentation." am: a649a7df15
am: 8866fe9d1a

* commit '8866fe9d1ae99b6e3a5d0eb99e712a9f8b3ba48b':
  Fix documentation.
2016-01-07 01:27:10 +00:00
Josh Gao
62d65862a4 Merge "WA: Fix adb wait-for-device command" am: bf867cac7e
am: 4da27b1014

* commit '4da27b101499c59eb85e9650a97a7b2f980a2dee':
  WA: Fix adb wait-for-device command
2016-01-07 01:27:03 +00:00
Bertrand Simonnet
8866fe9d1a Merge "Fix documentation."
am: a649a7df15

* commit 'a649a7df15617e1e54cc89c2f682a5e6472bf304':
  Fix documentation.
2016-01-07 01:25:17 +00:00
Josh Gao
4da27b1014 Merge "WA: Fix adb wait-for-device command"
am: bf867cac7e

* commit 'bf867cac7eac5e43b6a1b0157800f9ad09a711b9':
  WA: Fix adb wait-for-device command
2016-01-07 01:25:11 +00:00
Bertrand Simonnet
a649a7df15 Merge "Fix documentation." 2016-01-07 01:22:23 +00:00
Bertrand SIMONNET
146360b4a6 Fix documentation.
This fixes the documentation for UploadService and the README file:
* stop mentioning Chrome OS as we forked the code.
* update the histogram declaration workflow. It is not tied to Chrome's
  histograms.xml file anymore.
* update the architecture explanation of metricsd. We split
  metrics_daemon into two daemons and are now using binder to log
  metrics.
* convert README to markdown to make it prettier when viewed in gitiles.

Bug: 26314417

Change-Id: I1e492f1211c1784e65dd4d3e473bb9aacefc3b5d
2016-01-06 17:19:30 -08:00
Josh Gao
bf867cac7e Merge "WA: Fix adb wait-for-device command" 2016-01-07 01:19:19 +00:00
Jorge Lucangeli Obes
f01db4f68b Merge "Use specific users for metricsd/metrics_collector." am: 23c2ffb0aa
am: 8d220f3294

* commit '8d220f329408cfffd4496ff98a7c8e3af5c52a64':
  Use specific users for metricsd/metrics_collector.
2016-01-06 21:39:39 +00:00
Jorge Lucangeli Obes
8d220f3294 Merge "Use specific users for metricsd/metrics_collector."
am: 23c2ffb0aa

* commit '23c2ffb0aae0716ff68c21eec0ed39585aebfedf':
  Use specific users for metricsd/metrics_collector.
2016-01-06 21:36:57 +00:00
Jorge Lucangeli Obes
23c2ffb0aa Merge "Use specific users for metricsd/metrics_collector." 2016-01-06 21:33:09 +00:00
Mark Salyzyn
c94f24cc7d Merge "Revert "logd: liblog: whitelist "snet_event_log""" am: 1a5bac2069
am: db677f2b8e

* commit 'db677f2b8e3bd9116d961ecb00ef38de98b1d1ed':
  Revert "logd: liblog: whitelist "snet_event_log""
2016-01-06 21:28:45 +00:00
Mark Salyzyn
db677f2b8e Merge "Revert "logd: liblog: whitelist "snet_event_log"""
am: 1a5bac2069

* commit '1a5bac2069c3b8a0f4b5ede91ec4f83be5509827':
  Revert "logd: liblog: whitelist "snet_event_log""
2016-01-06 21:26:48 +00:00
Mark Salyzyn
1a5bac2069 Merge "Revert "logd: liblog: whitelist "snet_event_log""" 2016-01-06 21:22:04 +00:00
Jorge Lucangeli Obes
b8827122a8 Use specific users for metricsd/metrics_collector.
/data/misc/metricsd only needs to be accessed by metricsd.
/data/misc/metrics_collector only needs to be accessed by
metrics_collector.

/data/misc/metrics needs to be writable by metrics_collector
and readable by metricsd. Make it 0750 metrics_collector:system
and keep running metricsd as group 'system' to allow reading.

Bug: 26337609
Change-Id: I169573cc547f154daa8b65c5f13bdc20964a3f2c
2016-01-06 13:19:25 -08:00
Mark Salyzyn
0ee8de3c2d Revert "logd: liblog: whitelist "snet_event_log""
Callers will not guarantee that they can or will ratelimit, we need to
retain the ability to blacklist snet_event_log as a result.

This reverts commit 6aa21b225d.

Bug: 26178938
Change-Id: Ibf47d2e23a84c56f5f72d02312c698df7ff2b601
2016-01-06 21:19:23 +00:00
Daniel Rosenberg
ba3e38f9e1 Merge "fastboot: Add "--slot other"" am: 6bb8f752ec
am: abf108f6b2

* commit 'abf108f6b2cbcc4aaf7cea9719aff8b569245d60':
  fastboot: Add "--slot other"
2016-01-06 20:56:13 +00:00
Daniel Rosenberg
abf108f6b2 Merge "fastboot: Add "--slot other""
am: 6bb8f752ec

* commit '6bb8f752ecee6ad1e4ec13273d61478b3f86714f':
  fastboot: Add "--slot other"
2016-01-06 20:54:17 +00:00
Daniel Rosenberg
6bb8f752ec Merge "fastboot: Add "--slot other"" 2016-01-06 20:50:12 +00:00
Daniel Rosenberg
ed60d0706e Merge "fastboot: correct set_active behavior" am: 275d091441
am: f88b8cbe15

* commit 'f88b8cbe157b4372d4f1277e85ed25315ecd6c30':
  fastboot: correct set_active behavior
2016-01-06 19:49:25 +00:00
Daniel Rosenberg
f88b8cbe15 Merge "fastboot: correct set_active behavior"
am: 275d091441

* commit '275d091441db09609a7d3ecc45976edd64a32299':
  fastboot: correct set_active behavior
2016-01-06 19:47:36 +00:00
Daniel Rosenberg
275d091441 Merge "fastboot: correct set_active behavior" 2016-01-06 19:43:06 +00:00
Daniel Rosenberg
c1743ba0d4 fastboot: Add "--slot other"
This allows you to flash to a slot other than the current one
without needing to enter the name of the slots.

Change-Id: I6bf8c29817be0a29b1abb005f1e72056cee126df
2016-01-06 19:42:01 +00:00
Daniel Rosenberg
15174d9bc7 fastboot: correct set_active behavior
Removed automatic reboot attached to set_active,
and fixed documentation error.

Change-Id: Idbb1639dc80870c17a6622dc78a7d78c88e268ab
2016-01-05 19:35:54 -08:00
Todd Poynor
4c4c8a863f Merge "metrics_collector: Fix build of tests" am: 89faffc066
am: 0261ae4bb5

* commit '0261ae4bb51483839e0c0ac8a3b54fd715a15275':
  metrics_collector: Fix build of tests
2016-01-06 01:38:34 +00:00
Todd Poynor
0261ae4bb5 Merge "metrics_collector: Fix build of tests"
am: 89faffc066

* commit '89faffc066ec77f06ce1e8772160ce5ccd4aff68':
  metrics_collector: Fix build of tests
2016-01-06 01:36:31 +00:00
Todd Poynor
89faffc066 Merge "metrics_collector: Fix build of tests" 2016-01-06 01:32:06 +00:00
Todd Poynor
4b50bf3a9a metrics_collector: Fix build of tests
IMetricsCollectorService implementation moved from libmetricscollectorservice
to metrics_collector executable, which means it needs to be compiled into test
main as well.

Bug: None
Change-Id: I29b0a3ae6164d2256366d61c3a3639d22b943a69
2016-01-05 17:27:36 -08:00
Dan Willemsen
d04c431698 Merge "Turn off -Wdate-time for crasher" am: 392867cff1
am: 3be0a0df2c

* commit '3be0a0df2c35e6d6644d89f097e05cb54dbe193c':
  Turn off -Wdate-time for crasher
2016-01-06 00:36:52 +00:00
Dan Willemsen
3be0a0df2c Merge "Turn off -Wdate-time for crasher"
am: 392867cff1

* commit '392867cff1584f2ee475aae4b8f89778085a7de0':
  Turn off -Wdate-time for crasher
2016-01-06 00:35:00 +00:00
Dan Willemsen
392867cff1 Merge "Turn off -Wdate-time for crasher" 2016-01-06 00:23:37 +00:00
Todd Poynor
157f4978b5 Merge "Remove metrics collector service trampoline" am: b256a47064
am: 949ffecffe

* commit '949ffecffe08d93d6d98102fae5b2c9274da4258':
  Remove metrics collector service trampoline
2016-01-06 00:07:26 +00:00
Josh Gao
d49815e42b Merge "debuggerd: fork and drop privileges when dumping." am: b8e9ebf8b4
am: 8a43d6ae06

* commit '8a43d6ae0641102965175aba25c514dae5ccd45c':
  debuggerd: fork and drop privileges when dumping.
2016-01-06 00:07:19 +00:00