Commit Graph

20849 Commits

Author SHA1 Message Date
Dimitry Ivanov ba01a14659 Merge "Add libart.so to the list of public libraries" 2016-01-12 03:07:27 +00:00
Dimitry Ivanov 3d5a43449f Add libart.so to the list of public libraries
This is a temporary workaround for apps relying
on libart internal state.

Bug: http://b/26436837
Change-Id: Ibd6a766c3c8edebe885d897565a72a7a407828c3
2016-01-11 14:53:59 -08:00
Nick Kralevich 39bf768138 am 55db2ebc: am ada332e4: am ecf184c9: am 9c9280d8: Merge "init: get rid of the remaining double mounts" am: acff074844
am: 5984267a54

* commit '5984267a544228a1944fb869f27ab20766025118':
2016-01-11 18:21:18 +00:00
Nick Kralevich 5496fe7916 am 21de44a8: am ec9bd166: am 45a49d0e: am ccac2be8: Merge "init: use SELinux /dev/null if available" am: e4e912c7e4
am: 4902084150

* commit '4902084150026b53e3a56dbbe1b073e1788590a4':
2016-01-11 18:21:12 +00:00
Nick Kralevich 837207e91c am ecf184c9: am 9c9280d8: Merge "init: get rid of the remaining double mounts" am: eab1e21996
am: 0d451960a5

* commit '0d451960a515d23c769be2bb42cc902ec10d427a':
2016-01-11 18:21:05 +00:00
Nick Kralevich 3052c31e42 am 45a49d0e: am ccac2be8: Merge "init: use SELinux /dev/null if available" am: 14adea307d
am: c157a769d0

* commit 'c157a769d00c804c6e2bbadf809016ff9b092f5b':
2016-01-11 18:20:57 +00:00
Nick Kralevich 5984267a54 am 55db2ebc: am ada332e4: am ecf184c9: am 9c9280d8: Merge "init: get rid of the remaining double mounts"
am: acff074844

* commit 'acff074844c263d2b453cad33b6e7a2852f9311e':
2016-01-11 18:09:33 +00:00
Nick Kralevich 4902084150 am 21de44a8: am ec9bd166: am 45a49d0e: am ccac2be8: Merge "init: use SELinux /dev/null if available"
am: e4e912c7e4

* commit 'e4e912c7e43bfe4802e825a5c6dbd9dbb42b3590':
2016-01-11 18:09:24 +00:00
Nick Kralevich 0d451960a5 am ecf184c9: am 9c9280d8: Merge "init: get rid of the remaining double mounts"
am: eab1e21996

* commit 'eab1e21996884fb1918e696efd21c175d96f6195':
2016-01-11 18:09:15 +00:00
Nick Kralevich c157a769d0 am 45a49d0e: am ccac2be8: Merge "init: use SELinux /dev/null if available"
am: 14adea307d

* commit '14adea307d86507fabdbb61a1ca27cf846f1f73e':
2016-01-11 18:09:04 +00:00
Jorge Lucangeli Obes c76e2a8dad Merge "adbd: Depend only on libminijail." am: 6fe9930722
am: 3cdfb3b0aa

* commit '3cdfb3b0aa6ae36663fb80a628ceda388da95cd6':
  adbd: Depend only on libminijail.
2016-01-09 00:17:58 +00:00
Jorge Lucangeli Obes 3cdfb3b0aa Merge "adbd: Depend only on libminijail."
am: 6fe9930722

* commit '6fe993072282c14419198e4a5bd84872637d30a5':
  adbd: Depend only on libminijail.
2016-01-09 00:15:20 +00:00
Elliott Hughes 81a70ac08e Merge "Improve dumb terminal support (emacs is dumb)." am: 46798ecd17
am: ec97cb8b50

* commit 'ec97cb8b509f06e658cfa2a2fb86e0fbe8e28e25':
  Improve dumb terminal support (emacs is dumb).
2016-01-09 00:13:09 +00:00
Elliott Hughes ec97cb8b50 Merge "Improve dumb terminal support (emacs is dumb)."
am: 46798ecd17

* commit '46798ecd1700c62472b9040e49a69207c5e33834':
  Improve dumb terminal support (emacs is dumb).
2016-01-09 00:09:03 +00:00
Jorge Lucangeli Obes 6fe9930722 Merge "adbd: Depend only on libminijail." 2016-01-08 23:59:32 +00:00
Elliott Hughes 46798ecd17 Merge "Improve dumb terminal support (emacs is dumb)." 2016-01-08 23:53:30 +00:00
Elliott Hughes d68ad69d1d Improve dumb terminal support (emacs is dumb).
Bug: http://b/26444032
Change-Id: Iaff4b09b613fd30ab7c4c73e096da34f37e0de07
2016-01-08 15:47:07 -08:00
Jorge Lucangeli Obes 4fc0c3d92a Merge "adbd: Remove check for set_supplementary_gids." am: fd3c12d224
am: 7356218161

* commit '7356218161220848920d5e117d304d442b79f44f':
  adbd: Remove check for set_supplementary_gids.
2016-01-08 23:06:21 +00:00
Jorge Lucangeli Obes 7356218161 Merge "adbd: Remove check for set_supplementary_gids."
am: fd3c12d224

* commit 'fd3c12d22403860506da56e763cdf3c373f6cd86':
  adbd: Remove check for set_supplementary_gids.
2016-01-08 23:03:40 +00:00
Jorge Lucangeli Obes fd3c12d224 Merge "adbd: Remove check for set_supplementary_gids." 2016-01-08 22:49:00 +00:00
Alex Vakulenko 979c9950e5 Merge "metricsd: Split out the trait name from the command name" am: c480b8e6dd
am: 6d2c274520

* commit '6d2c274520153fc3dfa7902200921c0938ab16f7':
  metricsd: Split out the trait name from the command name
2016-01-08 22:07:38 +00:00
Alex Vakulenko 6d2c274520 Merge "metricsd: Split out the trait name from the command name"
am: c480b8e6dd

* commit 'c480b8e6dd8a18566b391a9893436311452027c1':
  metricsd: Split out the trait name from the command name
2016-01-08 22:05:25 +00:00
Alex Vakulenko c480b8e6dd Merge "metricsd: Split out the trait name from the command name" 2016-01-08 22:00:35 +00:00
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 ba95a94e3e metricsd: Split out the trait name from the command name
weaved::Service::AddCommandHandler() and SetStateProperty() now
expect the trait name as a separate argument.

BUG: 26443877
Change-Id: I2ad587d984375a7ebd70c7dc804b446b66d6be1b
2016-01-08 13:51:15 -08:00
Alex Vakulenko b50bc6b360 Merge "metrics: Switch to use Binder interface to weaved" 2016-01-08 21:50:07 +00:00
Jorge Lucangeli Obes 218eb7c820 adbd: Depend only on libminijail.
With https://android-review.googlesource.com/#/c/195460,
adbd can depend only on libminijail, without having to include its
dependencies.

Bug: 26099611
Change-Id: I2312d8584dda88b4a4619d3100d0983fa2833ba5
2016-01-08 13:33:01 -08: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
Jorge Lucangeli Obes fd79a5d9c1 adbd: Remove check for set_supplementary_gids.
With https://android-review.googlesource.com/#/c/195400, Minijail will
check for this failure so there's no need to do it here, which allows
to simplify the code.

Bug: 26099611
Change-Id: I7c876fdcab874ed403f82bdd5a4048c0f1e5db58
2016-01-08 10:56:20 -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