Steve Fung
f73ff283ef
am 51bdc5bf: Merge "Update crash_reporter and metrics rc files to trigger on post-fs-data"
...
* commit '51bdc5bf1aafee75e8021635db253cf393850e32':
Update crash_reporter and metrics rc files to trigger on post-fs-data
2015-10-15 04:04:53 +00:00
Steve Fung
51bdc5bf1a
Merge "Update crash_reporter and metrics rc files to trigger on post-fs-data"
2015-10-15 03:59:33 +00:00
Steve Fung
0d6cdfb7f0
Update crash_reporter and metrics rc files to trigger on post-fs-data
...
The /data directory isn't guaranteed to be mounted during the
"on boot" trigger, so switch them to using "on post-fs-data".
Bug: 24941965
Change-Id: Iee84ca0e934967cff7bc4d968d9939d398c73980
2015-10-14 18:22:32 -07:00
Bertrand Simonnet
a387c9c9cd
am defbd39c: Merge "metricsd: Read build time values from etc/os-release.d."
...
* commit 'defbd39cebb0aa9a982d91a9900cebfbcd0d59ae':
metricsd: Read build time values from etc/os-release.d.
2015-10-15 00:38:53 +00:00
Bertrand Simonnet
defbd39ceb
Merge "metricsd: Read build time values from etc/os-release.d."
2015-10-15 00:33:01 +00:00
Steve Fung
d8cd999457
am fcc93587: Merge "crash_reporter: Update to use the os-release.d configs"
...
* commit 'fcc93587a19736f73a700c73a03be11b1dbde74d':
crash_reporter: Update to use the os-release.d configs
2015-10-14 23:32:15 +00:00
Bertrand SIMONNET
eb697abf5e
metricsd: Read build time values from etc/os-release.d.
...
This stops relying on system properties to provide build time
configuration.
Product version and id will be stored in /etc/os-release.d.
Channel will be pulled from update engine.
BUG: 24947119
Change-Id: I0972d03cd83ef622846de3cce3dec1992fcc46cd
2015-10-14 15:58:06 -07:00
Steve Fung
fcc93587a1
Merge "crash_reporter: Update to use the os-release.d configs"
2015-10-14 22:48:25 +00:00
Christopher Ferris
a6be63e9ab
am 7d691756: Merge "Make allocations use unique_ptr."
...
* commit '7d691756e8bcdbd66889f7c07c82fbcd07a8d793':
Make allocations use unique_ptr.
2015-10-14 21:13:32 +00:00
Christopher Ferris
7d691756e8
Merge "Make allocations use unique_ptr."
2015-10-14 21:10:05 +00:00
Christopher Ferris
634df89db6
Make allocations use unique_ptr.
...
Change-Id: I4b84b8106faeaeb61847f8f9d13fd6444f474efd
2015-10-14 14:03:29 -07:00
Sami Tolvanen
415f1bdcbf
am 4bd3148e: Merge "Revert "Error correction: Use libfec in fs_mgr""
...
* commit '4bd3148e0f509efb75256a01959c9c1af9ffa845':
Revert "Error correction: Use libfec in fs_mgr"
2015-10-14 19:52:24 +00:00
Sami Tolvanen
4bd3148e0f
Merge "Revert "Error correction: Use libfec in fs_mgr""
2015-10-14 19:47:59 +00:00
Sami Tolvanen
0923453462
Revert "Error correction: Use libfec in fs_mgr"
...
This reverts commit 3de3a0f351 .
Change-Id: I1f121cbc4431b8d8ff146eab29832a8dda1eb8ba
2015-10-14 19:46:16 +00:00
Badhri Jagan Sridharan
4b542afe05
am ba000511: Merge "adbd: Add os descriptor support for adb."
...
* commit 'ba0005118b78dc8ff456492bb1e16947ab26be9e':
adbd: Add os descriptor support for adb.
2015-10-14 17:32:55 +00:00
Badhri Jagan Sridharan
ba0005118b
Merge "adbd: Add os descriptor support for adb."
2015-10-14 17:28:53 +00:00
Sami Tolvanen
81ef65827c
am a2cfddd3: Merge "Error correction: Use libfec in fs_mgr"
...
* commit 'a2cfddd37e950ed75d72e6a968d7be974aac405f':
Error correction: Use libfec in fs_mgr
2015-10-14 16:40:33 +00:00
Sami Tolvanen
a2cfddd37e
Merge "Error correction: Use libfec in fs_mgr"
2015-10-14 16:35:51 +00:00
Steve Fung
72e3c828dc
crash_reporter: Update to use the os-release.d configs
...
The product_id and product_version has been moved into the
/etc/os-release.d key-value store, update crash_reporter to
use these values.
Bug: 22874192
Change-Id: I71886574d1aa4e0a3ac18e1c361ec65684af9b49
2015-10-13 16:34:01 -07:00
Alex Vakulenko
baae30d913
am 7d85a6a5: Merge "system/core: Rename "chromeos" -> "brillo" in include paths and namespaces"
...
* commit '7d85a6a56867c0380a0f652e3dd59abeff4f2baa':
system/core: Rename "chromeos" -> "brillo" in include paths and namespaces
2015-10-13 23:18:19 +00:00
Alex Vakulenko
7d85a6a568
Merge "system/core: Rename "chromeos" -> "brillo" in include paths and namespaces"
2015-10-13 23:12:29 +00:00
Alex Vakulenko
74dc62460b
system/core: Rename "chromeos" -> "brillo" in include paths and namespaces
...
libchromeos is transitioning to libbrillo and chromeos namespaces
and include directory is changing to brillo.
Bug: 24872993
Change-Id: I797613a38c7444a113f12e38366a424388477276
2015-10-13 15:29:24 -07:00
Mark Salyzyn
ff5ef45e29
am cee44732: Merge "logd: correct for number of elements in prune"
...
* commit 'cee44732e61c3e0f9491aa6cea78670ed6c9c89d':
logd: correct for number of elements in prune
2015-10-13 22:25:43 +00:00
Mark Salyzyn
cee44732e6
Merge "logd: correct for number of elements in prune"
2015-10-13 22:20:29 +00:00
Steve Fung
d7f1771608
am 4f11a401: Merge "crash_reporter: Report the bdk_version"
...
* commit '4f11a401fc0e8714ed3554c5f9a197c5d21790a9':
crash_reporter: Report the bdk_version
2015-10-13 21:19:01 +00:00
Steve Fung
4f11a401fc
Merge "crash_reporter: Report the bdk_version"
2015-10-13 21:14:35 +00:00
Mark Salyzyn
58b8be8906
logd: correct for number of elements in prune
...
Chatty logs would distort the average log size by elevating the
elements, but not the size. Add statistical collection for the
number of elements that report chatty, and subtract that from
the number of elements to improve the pruning estimate. Pick
minElements as 1% rather than 10% of the total with this more
accurate number of elements, to a minumum of 4.
Bug: 24511000
Change-Id: I3f36558138aa0b2a50e4fac6440c3a8505d95276
2015-10-13 13:43:16 -07:00
Mark Salyzyn
904864554e
am 9b3a2784: Merge "logd: use coalesce instead of merge (cleanup)"
...
* commit '9b3a2784b94d88492906384ab3f3c9863f6b5eea':
logd: use coalesce instead of merge (cleanup)
2015-10-13 16:52:02 +00:00
Mark Salyzyn
9b3a2784b9
Merge "logd: use coalesce instead of merge (cleanup)"
2015-10-13 16:47:15 +00:00
Elliott Hughes
5a862a3d5c
am 2154e421: Merge "Switch to android::base::ReadFully"
...
* commit '2154e421688679e6131a0d92486fa11a689e0034':
Switch to android::base::ReadFully
2015-10-13 14:55:46 +00:00
Sami Tolvanen
3de3a0f351
Error correction: Use libfec in fs_mgr
...
Use libfec to read and parse verity metadata to protect against data
corruption.
Bug: 21893453
Change-Id: Ieee6a1441e2f68148ba635235216e36c69b13db1
2015-10-13 15:53:25 +01:00
Elliott Hughes
2154e42168
Merge "Switch to android::base::ReadFully"
2015-10-13 14:50:22 +00:00
Johan Redestig
67b3cad9a0
Switch to android::base::ReadFully
...
The if (read(...size) != size) pattern is unreliable, switch
to the android base ReadFully which wraps read in a loop.
Change-Id: I2324e4c45da3c9b53b18df6eb09ce69a6604b5d1
2015-10-13 14:49:38 +00:00
Elliott Hughes
fb4f25c8cd
am 73bf853e: Merge "Switch fs_mgr_verity.c to C++."
...
* commit '73bf853edfd89c733fabb563a5dcd20a6599ffb9':
Switch fs_mgr_verity.c to C++.
2015-10-13 14:49:01 +00:00
Elliott Hughes
73bf853edf
Merge "Switch fs_mgr_verity.c to C++."
2015-10-13 14:43:47 +00:00
Sergio Giro
9443fd94e3
am f8376607: Merge "system/core: fix iterator for LruCache"
...
* commit 'f83766079e248e04065103a4720364c0193777ee':
system/core: fix iterator for LruCache
2015-10-13 07:36:52 +00:00
Sergio Giro
f83766079e
Merge "system/core: fix iterator for LruCache"
2015-10-13 07:30:34 +00:00
Mark Salyzyn
7c009ac097
am 1c04253a: Merge "logd: object layer format statistics"
...
* commit '1c04253af2077de0250e4082cadd4f9bfffc4ea2':
logd: object layer format statistics
2015-10-12 22:14:26 +00:00
Mark Salyzyn
1c04253af2
Merge "logd: object layer format statistics"
2015-10-12 22:10:30 +00:00
Alex Vakulenko
bd00620003
am 5117e413: Merge "Update metrics to use weaved\'s client library"
...
* commit '5117e41392ca60e416585f04fca453ad51948afe':
Update metrics to use weaved's client library
2015-10-12 20:44:40 +00:00
Alex Vakulenko
5117e41392
Merge "Update metrics to use weaved's client library"
2015-10-12 20:36:15 +00:00
Sergio Giro
0cb59c0dce
system/core: fix iterator for LruCache
...
Was failing to return the first element
Change-Id: Ic803f5d463a56519212014d0d190407cf4b859cf
2015-10-12 16:13:44 +01:00
Steve Fung
aa265b633b
crash_reporter: Report the bdk_version
...
Add the bdk_version to the crash report.
Bug: 24579018
Change-Id: I00ad1079ee3aacc5d0456f80d83f42c4d28045df
2015-10-12 00:42:05 -07:00
Nick Kralevich
545b7c9e39
am 2fb90dc8: Merge changes from topic \'userspace-audit\'
...
* commit '2fb90dc8b2b590e674c5e433e8bf3d3f08a887c8':
debuggerd: audit pid, uid and gid on SE Linux denial
property_service: log pid,uid and gid of setprop client
2015-10-10 20:11:08 +00:00
Nick Kralevich
2fb90dc8b2
Merge changes from topic 'userspace-audit'
...
* changes:
debuggerd: audit pid, uid and gid on SE Linux denial
property_service: log pid,uid and gid of setprop client
2015-10-10 20:07:24 +00:00
Steve Fung
0a1af8fdbf
am 4b2d6dd3: Merge "crash_reporter: Use the actual GID of the crashing process"
...
* commit '4b2d6dd346a2c58cf034229afaaf91cc82901d5e':
crash_reporter: Use the actual GID of the crashing process
2015-10-10 05:37:50 +00:00
Steve Fung
4b2d6dd346
Merge "crash_reporter: Use the actual GID of the crashing process"
2015-10-10 05:33:49 +00:00
Alex Vakulenko
82b02de5aa
Update metrics to use weaved's client library
...
Do not use weave'd D-Bus proxies directly. Use the new client library.
Change-Id: I524d9c5c4c057bd1f82a280ec96848b8a8f4fe29
2015-10-09 20:07:47 -07:00
Nick Kralevich
281071435a
am 9e27cab6: Merge "init.rc: Disable sysrq from the keyboard"
...
* commit '9e27cab695b0e2a4910cf576d306a3379991f1f7':
init.rc: Disable sysrq from the keyboard
2015-10-10 00:38:18 +00:00
Nick Kralevich
9e27cab695
Merge "init.rc: Disable sysrq from the keyboard"
2015-10-10 00:33:50 +00:00