Commit Graph

20213 Commits

Author SHA1 Message Date
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 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
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
Nick Kralevich cb2202f614 Merge "fs_config: remove setuid bit from librank" am: 0380d49024
am: dee5c24927

* commit 'dee5c24927754c7a3213a3118f53cb119f00ad85':
  fs_config: remove setuid bit from librank
2015-11-30 14:57:05 +00:00
Nick Kralevich dee5c24927 Merge "fs_config: remove setuid bit from librank"
am: 0380d49024

* commit '0380d49024a408c726d3336551840381a6fbff45':
  fs_config: remove setuid bit from librank
2015-11-30 14:54:41 +00:00
Nick Kralevich 0380d49024 Merge "fs_config: remove setuid bit from librank" 2015-11-30 14:53:20 +00:00
Nick Kralevich 3e6356834f fs_config: remove setuid bit from librank
Anyone wanting to call /system/xbin/librank can execute "su"
beforehand. There's no need for it to be setuid root.

Bug: 25739721
Change-Id: Ie3d68701397d21e901bf1ec17b4b4a9f12128d2d
2015-11-27 18:08:22 -08:00
Mark Salyzyn 255dd638c3 liblog: resolve deadlocks (part deux) am: f280b020b1
am: 836a4f3a9d

* commit '836a4f3a9d0243af007a85522225b5acd1b0a633':
  liblog: resolve deadlocks (part deux)
2015-11-26 01:13:17 +00:00
Mark Salyzyn 836a4f3a9d liblog: resolve deadlocks (part deux)
am: f280b020b1

* commit 'f280b020b1230377deabe44bafb0b2bd2fb4876b':
  liblog: resolve deadlocks (part deux)
2015-11-26 00:07:06 +00:00
Mark Salyzyn f280b020b1 liblog: resolve deadlocks (part deux)
(cherry pick from commit 2d2e0a5c5e)

Although ever present, an increased regression introduced with
commit b6bee33182 (liblog: logd:
support logd.timestamp = monotonic).

A signal handler can interrupt in locked context, if log is written
in the signal handler, we are in deadlock. To reduce the contention
and chances for this problem separate out timestamp lock from is
loggable lock to reduce contention situations. Provide a best-guess
response if lock would fail in timestamp path.

Use a common lock() inline within each module, with a comment speaking
to the issues surrounding calling a function that has a mutex within
a signal handler.

ToDo: Hold off signals temporarily in mainline, restart when unblock.
      Can not use pthread_sigmask(SIG_BLOCK,,) as it breaks AtCmd.

Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Bug: 25563384
Change-Id: I47e2c87c988c3e359eb9eef129c6a3a08e9eedef
2015-11-25 13:52:09 -08:00
Steve Fung 0f9d883ef8 Merge "crash_reporter: Use cacerts_google" am: 2e012ef3bf am: 2e7f3dd769
am: 1ca2413e6d

* commit '1ca2413e6dc5c50b5b86e3ae74214aa8e9263d2f':
  crash_reporter: Use cacerts_google
2015-11-24 21:25:31 +00:00
Steve Fung 1ca2413e6d Merge "crash_reporter: Use cacerts_google" am: 2e012ef3bf
am: 2e7f3dd769

* commit '2e7f3dd7693eee5c58bcd37a3247fae072934a83':
  crash_reporter: Use cacerts_google
2015-11-24 21:21:53 +00:00
Steve Fung 2e7f3dd769 Merge "crash_reporter: Use cacerts_google"
am: 2e012ef3bf

* commit '2e012ef3bf3dfa5cb5d36318ef0f8d948608d584':
  crash_reporter: Use cacerts_google
2015-11-24 21:17:41 +00:00
Steve Fung 2e012ef3bf Merge "crash_reporter: Use cacerts_google" 2015-11-24 21:13:12 +00:00
Josh Gao 2af172be26 Merge changes I36b66fc5,I0561affb am: 166e716851 am: 8e82180c83
am: d9a3f0b65f

* commit 'd9a3f0b65f7d60f7e70226baaf5cf04540946347':
  libcutils: turn on -Werror on Win32, fix resulting build break.
  libcutils: add prefix to local variables in Android.mk.
2015-11-24 20:24:17 +00:00
Josh Gao d9a3f0b65f Merge changes I36b66fc5,I0561affb am: 166e716851
am: 8e82180c83

* commit '8e82180c83eb89069716fb790ed0f006e469be1c':
  libcutils: turn on -Werror on Win32, fix resulting build break.
  libcutils: add prefix to local variables in Android.mk.
2015-11-24 20:20:44 +00:00
Josh Gao 8e82180c83 Merge changes I36b66fc5,I0561affb
am: 166e716851

* commit '166e716851a11f1c2280b211fe00017e1eb2c3b5':
  libcutils: turn on -Werror on Win32, fix resulting build break.
  libcutils: add prefix to local variables in Android.mk.
2015-11-24 20:17:30 +00:00
Josh Gao 166e716851 Merge changes I36b66fc5,I0561affb
* changes:
  libcutils: turn on -Werror on Win32, fix resulting build break.
  libcutils: add prefix to local variables in Android.mk.
2015-11-24 20:12:08 +00:00
Josh Gao 1175d0fdb0 libcutils: turn on -Werror on Win32, fix resulting build break.
Mingw doesn't provide strndup or strtok_r used in str_parms.c, resulting in
-Wimplicit-function-declaration being emitted for the Windows build.
None of the consumers of str_parms.c appear to be compiled for Windows,
so we can just remove it from the Windows build.

Change-Id: I36b66fc54ed261d38f5294bc8662ddb2db4fe64f
2015-11-24 09:35:45 -08:00