Commit Graph

20381 Commits

Author SHA1 Message Date
Bertrand Simonnet 1462c78c9c Merge "metricsd: Add clang format config." 2015-12-02 22:31:33 +00:00
Josh Gao f681478787 Merge "adb: don\'t divide by zero" am: 1702f427b5 am: e53fadf4b3
am: 9f941b96f5

* commit '9f941b96f52e975e97f3f3c41bc5d931fe8fb0e6':
  adb: don't divide by zero
2015-12-02 22:09:56 +00:00
Josh Gao 9f941b96f5 Merge "adb: don\'t divide by zero" am: 1702f427b5
am: e53fadf4b3

* commit 'e53fadf4b3ed5a4e034df2729444f0dddf91300d':
  adb: don't divide by zero
2015-12-02 22:04:57 +00:00
Josh Gao e53fadf4b3 Merge "adb: don\'t divide by zero"
am: 1702f427b5

* commit '1702f427b53b88d9517bb994844a9a15e02f2bba':
  adb: don't divide by zero
2015-12-02 22:00:10 +00:00
Josh Gao 1702f427b5 Merge "adb: don't divide by zero" 2015-12-02 21:56:04 +00:00
Tom Cherry 6036114f93 Abort if __system_property_area_init fails
If __system_property_area_init() fails, there is a fundamental issue
with the system and we should abort from init.

Bug: 21852512
Change-Id: I05d7978ba3bcc347027a6d9443de7cdd229033d2
2015-12-02 11:29:12 -08:00
Elliott Hughes b69320e215 Merge "Fix "adb sync" (and "adb push") error reporting." am: d0d87f78e5 am: 59021ad415
am: fa454c1faa

* commit 'fa454c1faab102458d18fc07d1f8211bd89da80b':
  Fix "adb sync" (and "adb push") error reporting.
2015-12-02 19:06:39 +00:00
Elliott Hughes fa454c1faa Merge "Fix "adb sync" (and "adb push") error reporting." am: d0d87f78e5
am: 59021ad415

* commit '59021ad415f10004eb7f936bc55062efc027b9b4':
  Fix "adb sync" (and "adb push") error reporting.
2015-12-02 19:03:12 +00:00
Elliott Hughes 59021ad415 Merge "Fix "adb sync" (and "adb push") error reporting."
am: d0d87f78e5

* commit 'd0d87f78e55362e3792ddec5faeab247f3493858':
  Fix "adb sync" (and "adb push") error reporting.
2015-12-02 18:59:16 +00:00
Elliott Hughes d0d87f78e5 Merge "Fix "adb sync" (and "adb push") error reporting." 2015-12-02 18:53:28 +00:00
Jim Guggemos 7451d7c8af Revert "fs_mgr: Add support for A/B partitions"
am: fe93f4015e

* commit 'fe93f4015ef5f3038a925c34b7f6b3cb68a6636c':
  Revert "fs_mgr: Add support for A/B partitions"
2015-12-02 16:44:03 +00:00
Bertrand SIMONNET 0c7e29b42e metricsd: Add clang format config.
This will make it easier to catch formatting nits.
This style is based on the Google style guide (well known publicly) and
follows the Chromium style changes we have adopted.

Bug: 25887990

Change-Id: If9562223752dfe611a32c341e703338f806bcc0f
2015-12-02 16:42:11 +00:00
Jim Guggemos fe93f4015e Revert "fs_mgr: Add support for A/B partitions"
The original CL landed on AOSP in 8bb2f36 in August.
It was then removed and superseded by 227ef3c5 in September.
However, 8bb2f36 was then cherry-picked onto mnc-dr2-dev and
automerged back into mnc-dr2-dev-plus-aosp.

This revert CL fixes an issue that was causing init to hang
before mounting any filesystems on edison (and probably
other platforms).

This reverts commit ebff8b97d5, reversing
changes made to d254d33ece.

Change-Id: Ia5b35217c1f4730bccb7374c24089e439d21752d
2015-12-02 16:35:25 +00:00
Tom Cherry e36a85cdcc restorecon /property_contexts
/property_contexts exists before selinux policies are loaded, so we must
restorecon before other processes can access it

Bug: 21852512
Change-Id: Ie983caac635eb928ab19eea996a5625f3673de39
2015-12-01 17:47:35 -08:00
Josh Gao 68e26811f0 Merge changes I25bdcbc5,I12314da5,I055b0821 am: a3892504ac am: 81d3447fa9
am: fd3770a5a2

* commit 'fd3770a5a26b23303d49686cd24bab2939e5776b':
  adb: don't pull symlinks when pulling a directory
  adb: remove extraneous newline from skip message
  adb: correctly count skipped files in push/pull
2015-12-01 02:52:46 +00:00
Josh Gao fd3770a5a2 Merge changes I25bdcbc5,I12314da5,I055b0821 am: a3892504ac
am: 81d3447fa9

* commit '81d3447fa92357672d0ce2a4d914854137c801ea':
  adb: don't pull symlinks when pulling a directory
  adb: remove extraneous newline from skip message
  adb: correctly count skipped files in push/pull
2015-12-01 02:49:33 +00:00
Josh Gao 81d3447fa9 Merge changes I25bdcbc5,I12314da5,I055b0821
am: a3892504ac

* commit 'a3892504acda9ab280db5ade66c0d961fbd936a6':
  adb: don't pull symlinks when pulling a directory
  adb: remove extraneous newline from skip message
  adb: correctly count skipped files in push/pull
2015-12-01 02:46:37 +00:00
Josh Gao a3892504ac Merge changes I25bdcbc5,I12314da5,I055b0821
* changes:
  adb: don't pull symlinks when pulling a directory
  adb: remove extraneous newline from skip message
  adb: correctly count skipped files in push/pull
2015-12-01 02:42:09 +00:00
Dan Willemsen d8ef1873f4 Merge "liblog: enable windows builds in soong" am: 3a6ae02b7b am: ab00a991bf
am: 978449b081

* commit '978449b0810a41f70fc4b9eb05f19aad54e189b2':
  liblog: enable windows builds in soong
2015-12-01 02:34:51 +00:00
Dan Willemsen 978449b081 Merge "liblog: enable windows builds in soong" am: 3a6ae02b7b
am: ab00a991bf

* commit 'ab00a991bf8a74faee4e43f0890d657417e1f2c1':
  liblog: enable windows builds in soong
2015-12-01 02:31:18 +00:00
Dan Willemsen ab00a991bf Merge "liblog: enable windows builds in soong"
am: 3a6ae02b7b

* commit '3a6ae02b7b604319165811b802162b6f7a3837fd':
  liblog: enable windows builds in soong
2015-12-01 02:28:14 +00:00
Dan Willemsen 3a6ae02b7b Merge "liblog: enable windows builds in soong" 2015-12-01 02:23:33 +00:00
Bertrand Simonnet 83c2b1cd0e Merge "metricsd: Use different directories for each daemon." am: 03f9069acc am: 9d5a431657
am: 089e1fb112

* commit '089e1fb112e2fd3909a65cfd460516409ff29187':
  metricsd: Use different directories for each daemon.
2015-12-01 01:02:21 +00:00
Bertrand Simonnet fec292c751 Merge "metricsd: Specify directory for persistent integers." am: 8a2a635d3c am: 20bb55e6ea
am: f9699e710c

* commit 'f9699e710cd903a783ffb18147785983ed2b7336':
  metricsd: Specify directory for persistent integers.
2015-12-01 01:02:14 +00:00
Bertrand Simonnet 089e1fb112 Merge "metricsd: Use different directories for each daemon." am: 03f9069acc
am: 9d5a431657

* commit '9d5a431657c453d3bdf81c28a214c87250914dd4':
  metricsd: Use different directories for each daemon.
2015-12-01 00:59:19 +00:00
Bertrand Simonnet f9699e710c Merge "metricsd: Specify directory for persistent integers." am: 8a2a635d3c
am: 20bb55e6ea

* commit '20bb55e6eadc9f07581357c71b841672bea26335':
  metricsd: Specify directory for persistent integers.
2015-12-01 00:59:12 +00:00
Bertrand Simonnet 9d5a431657 Merge "metricsd: Use different directories for each daemon."
am: 03f9069acc

* commit '03f9069acc3865135330f51413365f94e86409fc':
  metricsd: Use different directories for each daemon.
2015-12-01 00:56:29 +00:00
Bertrand Simonnet 20bb55e6ea Merge "metricsd: Specify directory for persistent integers."
am: 8a2a635d3c

* commit '8a2a635d3cba7253b77a9aeaa922c680d561eba0':
  metricsd: Specify directory for persistent integers.
2015-12-01 00:56:23 +00:00
Bertrand Simonnet 03f9069acc Merge "metricsd: Use different directories for each daemon." 2015-12-01 00:51:39 +00:00
Bertrand Simonnet 8a2a635d3c Merge "metricsd: Specify directory for persistent integers." 2015-12-01 00:51:02 +00:00
Christopher Ferris 5f1fccf87a Merge "Change the way some maps are printed." am: 07d9de7016 am: bedab17693
am: 4690cf6108

* commit '4690cf6108e67bcf1b0440b7f2fa18e244f57ef6':
  Change the way some maps are printed.
2015-12-01 00:42:38 +00:00
Christopher Ferris 4690cf6108 Merge "Change the way some maps are printed." am: 07d9de7016
am: bedab17693

* commit 'bedab17693fb9897c1f55735fbde5067a9c82cc6':
  Change the way some maps are printed.
2015-12-01 00:39:16 +00:00
Christopher Ferris bedab17693 Merge "Change the way some maps are printed."
am: 07d9de7016

* commit '07d9de701631aed34929c31cae89c22e76318743':
  Change the way some maps are printed.
2015-12-01 00:34:05 +00:00
Christopher Ferris 07d9de7016 Merge "Change the way some maps are printed." 2015-12-01 00:29:38 +00:00
Dan Willemsen a3f41bf774 liblog: enable windows builds in soong
Change-Id: I426cdebeddf653bf2daacb3e0724516ac78756cb
2015-11-30 15:57:41 -08:00
Jeff Sharkey a5954de3bb Create credential-encrypted system dir for owner.
Other user directories are created correctly, but owner is still
special cased.

Bug: 22358539
Change-Id: I2bbd3023cdbcbb5315ebc32ba54dc3ddb9a280d6
2015-11-30 16:56:01 -07:00
Christopher Ferris da750a79c9 Change the way some maps are printed.
Before, an anonymous map wound up printing the pc as relative.
Unfortunately, this meant that it was impossible to tell the actual
pc. The new code prints the map name as <anonymous:map_start> and
still prints the pc as relative.

In addition, add the start of the map for map names that begin with a
'[' character.

Bug: 25844836
Change-Id: Ie0b6149dde258fe13f0e5a3e5739d85374512f4b
2015-11-30 14:39:52 -08:00
Bertrand SIMONNET 9d3a4aeae2 metricsd: Use different directories for each daemon.
Instead of using a single directory for both the internal data of
metricsd and metrics_collector and the shared files (metrics samples log
file and the metrics enabled file), we should use separate directory to
allow for a finer access control.

The new structure will be:
* /data/misc/metrics for the files accessible to all daemons reporting
  metrics, metricsd and metrics_collector.
* /data/misc/metricsd for the private files of metricsd.
* /data/misc/metrics_collector for the private files of
  metrics_collector.

Bug: 25886951
Test: Unit tests.
Test: Manual: metricsd and metrics_collector run without errors.

Change-Id: I006d19f45f5f419d2b08744126c2e2a0b899c9fa
2015-11-30 13:34:49 -08:00
Bertrand SIMONNET a7bc1c14df metricsd: Specify directory for persistent integers.
Instead of using a global directory for persistent integers, specify the
directory to use in the constructor.
This will make changing the backing directory easier.

Bug: 25886951

Change-Id: I590816b195fa81b179a5ec78b9cdf41bc86353dc
2015-11-30 13:34:49 -08:00
Josh Gao b0e039f4ca adb: don't divide by zero
If we stat a file and get a size of 0, and then successfully read bytes
from that file, we would previously divide by zero when calculating the
percentage completion of the file. This case happens either when we're
racing against something else writing to the file, or when we're pulling
magical files such as the ones in /dev/cpuctl/ that lie about their
size.

Bug: http://b/25925733
Change-Id: I980b9c14f44a1eb4a42bc8736c94fa6db06c08d1
2015-11-30 12:03:12 -08:00
Josh Gao 7b284b2f22 adb: don't pull symlinks when pulling a directory
The previous change to do this (f96dc73b) only skipped individually
named symlinks, not symlinks inside of a directory that was being
pulled.

Bug: http://b/25601283
Change-Id: I25bdcbc546a9d3a0dbd8dacdb065fb134d96022b
2015-11-30 11:02:44 -08:00
Josh Gao d3266e058e adb: remove extraneous newline from skip message
Change-Id: I12314da589bf0db14b37ae4c1f526665182f4776
2015-11-30 11:02:21 -08:00
Tim Murray a53ec324bd DO NOT MERGE: add support for new sched tracepoint
This tracepoint gives systrace the means to display the reason
for uninterruptible sleep.

bug 23350688

Change-Id: Iaf9c929fe1169f8872a7f8135343950aa322b0f5
2015-11-30 10:58:26 -08:00
Nick Kralevich 7039ef206c Merge "fs_config.c: Remove obsolete reference to /system/bin/pppd-ril" am: e08e4656db am: 9efbfda576
am: aa68a571b4

* commit 'aa68a571b4ea8a1ea41153925374aaaacd1253a6':
  fs_config.c: Remove obsolete reference to /system/bin/pppd-ril
2015-11-30 18:51:43 +00:00
Nick Kralevich aa68a571b4 Merge "fs_config.c: Remove obsolete reference to /system/bin/pppd-ril" am: e08e4656db
am: 9efbfda576

* commit '9efbfda5764c8d2a1abb4a4e88caf0aa3c9c92ea':
  fs_config.c: Remove obsolete reference to /system/bin/pppd-ril
2015-11-30 18:49:28 +00:00
Nick Kralevich 9efbfda576 Merge "fs_config.c: Remove obsolete reference to /system/bin/pppd-ril"
am: e08e4656db

* commit 'e08e4656db4454fb44cf3ee95d0eda75230086f1':
  fs_config.c: Remove obsolete reference to /system/bin/pppd-ril
2015-11-30 18:47:27 +00:00
Nick Kralevich e08e4656db Merge "fs_config.c: Remove obsolete reference to /system/bin/pppd-ril" 2015-11-30 18:45:14 +00:00
Josh Gao dd6cc4d7ee adb: correctly count skipped files in push/pull
Bug: http://b/25650207
Change-Id: I055b08216938640c4f7c5e96a7ea3719bf90ba70
2015-11-30 10:42:37 -08:00
Nick Kralevich cbbc66174c fs_config.c: Remove obsolete reference to /system/bin/pppd-ril
Codesearch finds no reference to this in the Android tree. It was
added in 2010 in commit bbf1c64527.

Change-Id: I8cd1153912b78b4b23b8f5ba2577a58c5c49e316
2015-11-30 09:17:18 -08:00
Nick Kralevich 75f02b31a7 Merge "fs_config: remove setuid bit from librank" am: 0380d49024 am: dee5c24927
am: cb2202f614

* commit 'cb2202f614a1bffc6f0a9bad40def5a3608be722':
  fs_config: remove setuid bit from librank
2015-11-30 14:59:12 +00:00