Tom Cherry
b111a07962
am fdc6fbd0
: am b2acb6b2
: am b4998341
: Merge "move init.trace.rc to frameworks/native"
...
* commit 'fdc6fbd0c7f98fa44b86e834a88441cce3bdedaa':
move init.trace.rc to frameworks/native
2015-09-03 22:36:10 +00:00
Tom Cherry
fdc6fbd0c7
am b2acb6b2
: am b4998341
: Merge "move init.trace.rc to frameworks/native"
...
* commit 'b2acb6b2ce07bf9e1c944eadcdc2dafe3e41efaf':
move init.trace.rc to frameworks/native
2015-09-03 22:28:35 +00:00
Elliott Hughes
742372a489
am 27e427aa
: am db31ac76
: am 478da637
: Merge "Improve adb sync_send error reporting."
...
* commit '27e427aaa2e56d68d914363df0c6b425837bab40':
Improve adb sync_send error reporting.
2015-09-03 22:06:21 +00:00
Christopher Ferris
9c146c6050
am 9b7f9c4b
: am 7f95fef6
: am 825477ff
: Merge "Add a logging handler on timeout."
...
* commit '9b7f9c4b005b174f24c3254cbaf7884d913d6ba6':
Add a logging handler on timeout.
2015-09-03 22:06:19 +00:00
Elliott Hughes
0817d582a4
am c46131a9
: am 14adafca
: am ce98fc40
: Merge "Lose ls to toybox."
...
* commit 'c46131a9a2715096639512a28a3d063761e0e326':
Lose ls to toybox.
2015-09-03 22:06:17 +00:00
Tom Cherry
b2acb6b2ce
am b4998341
: Merge "move init.trace.rc to frameworks/native"
...
* commit 'b499834121854fd98664d8d96734c733f96dbc1f':
move init.trace.rc to frameworks/native
2015-09-03 22:02:40 +00:00
Tom Cherry
b499834121
Merge "move init.trace.rc to frameworks/native"
2015-09-03 21:52:44 +00:00
Elliott Hughes
27e427aaa2
am db31ac76
: am 478da637
: Merge "Improve adb sync_send error reporting."
...
* commit 'db31ac76baf732244b9492a96db43fd90070411a':
Improve adb sync_send error reporting.
2015-09-03 21:41:56 +00:00
Christopher Ferris
9b7f9c4b00
am 7f95fef6
: am 825477ff
: Merge "Add a logging handler on timeout."
...
* commit '7f95fef6708212bcd3dbceefd8f0207df18db365':
Add a logging handler on timeout.
2015-09-03 21:34:41 +00:00
Elliott Hughes
db31ac76ba
am 478da637
: Merge "Improve adb sync_send error reporting."
...
* commit '478da6374b5f4a5742566edfe3057c674a51615e':
Improve adb sync_send error reporting.
2015-09-03 21:33:59 +00:00
Christopher Ferris
7f95fef670
am 825477ff
: Merge "Add a logging handler on timeout."
...
* commit '825477ff6bb62bf02654449dc1d9192a23acb81c':
Add a logging handler on timeout.
2015-09-03 21:26:51 +00:00
Elliott Hughes
478da6374b
Merge "Improve adb sync_send error reporting."
2015-09-03 21:25:13 +00:00
Tom Cherry
b0d5184774
move init.trace.rc to frameworks/native
...
init.trace.rc will be renamed to atrace.rc and use the LOCAL_INIT_RC
mechanism to be included on /system appropriately.
Bug 23186545
Change-Id: I55c37d3ff98c9ac10e6c1a713fadc7eb37346195
2015-09-03 14:19:11 -07:00
Christopher Ferris
825477ff6b
Merge "Add a logging handler on timeout."
2015-09-03 21:18:23 +00:00
Elliott Hughes
c46131a9a2
am 14adafca
: am ce98fc40
: Merge "Lose ls to toybox."
...
* commit '14adafca3e351abfd46076bc52804e258238cecb':
Lose ls to toybox.
2015-09-03 21:17:52 +00:00
Elliott Hughes
14adafca3e
am ce98fc40
: Merge "Lose ls to toybox."
...
* commit 'ce98fc40fd5d86a944a2cfe2e993315b670e3bfc':
Lose ls to toybox.
2015-09-03 21:07:04 +00:00
Elliott Hughes
ce98fc40fd
Merge "Lose ls to toybox."
2015-09-03 20:58:58 +00:00
Elliott Hughes
081696d27c
Improve adb sync_send error reporting.
...
Bug: http://b/23786900
Change-Id: I71f10de8d767eaf8bf0f5d9b8c304527e2b953ff
2015-09-03 13:55:55 -07:00
Bill Yi
04f4dae9e9
am 07ee1fa6
: am c3a64d38
: am cb6cd44d
: Merge "Revert "metricsd: Collect generic stats about the system.""
...
* commit '07ee1fa69a66000fbbb6817663c7ee1d9bc440c5':
Revert "metricsd: Collect generic stats about the system."
2015-09-03 19:50:48 +00:00
Bill Yi
07ee1fa69a
am c3a64d38
: am cb6cd44d
: Merge "Revert "metricsd: Collect generic stats about the system.""
...
* commit 'c3a64d38fe3c5b5c45455924d0223f77488f0297':
Revert "metricsd: Collect generic stats about the system."
2015-09-03 19:44:06 +00:00
Bill Yi
c3a64d38fe
am cb6cd44d
: Merge "Revert "metricsd: Collect generic stats about the system.""
...
* commit 'cb6cd44d5670ae988349c4a0dc917ff4ca321c11':
Revert "metricsd: Collect generic stats about the system."
2015-09-03 19:37:19 +00:00
Christopher Ferris
d7226f9a14
Add a logging handler on timeout.
...
If the signal handler doesn't fire in the given time when trying to unwind
a thread, put on a logging handler. This prevents crashes if the signal
does eventually fire.
Bug: 23783762
Change-Id: Ib7abb36b71d079a7043117697c41b535319586fd
2015-09-03 12:27:57 -07:00
Bill Yi
cb6cd44d56
Merge "Revert "metricsd: Collect generic stats about the system.""
2015-09-03 19:27:16 +00:00
Bill Yi
6d5822ed7b
Revert "metricsd: Collect generic stats about the system."
...
This reverts commit 90b02cd46d
.
Change-Id: I9950c688433e99b0bc4745f02e2f9ae66f3b5578
2015-09-03 19:18:56 +00:00
Yabin Cui
6f076713f3
am 9bbc68dd
: am 7d0b4ada
: am 6562c151
: Merge "adb: clean up debug tracing a little."
...
* commit '9bbc68dd0782966b3e5e583afabb7b94c02e860a':
adb: clean up debug tracing a little.
2015-09-03 18:26:19 +00:00
Bertrand Simonnet
f53cee56ac
am e5dbfdbf
: am ef391cb9
: am 9cd816b3
: Merge "metricsd: Log the histogram name to hash mapping."
...
* commit 'e5dbfdbf58accd2e00f1eb0de74a2d92f5808cb4':
metricsd: Log the histogram name to hash mapping.
2015-09-03 18:26:17 +00:00
Bertrand Simonnet
bd5cd1bac5
am 706c0717
: am 05b066e9
: am c1862479
: Merge "metricsd: Collect generic stats about the system."
...
* commit '706c0717f6dfdd8cb71d5dd76b944aa4f2f29e9e':
metricsd: Collect generic stats about the system.
2015-09-03 18:26:16 +00:00
Yabin Cui
9bbc68dd07
am 7d0b4ada
: am 6562c151
: Merge "adb: clean up debug tracing a little."
...
* commit '7d0b4ada0bf539a0f48b00e211799400aa733f4d':
adb: clean up debug tracing a little.
2015-09-03 18:14:05 +00:00
Bertrand Simonnet
e5dbfdbf58
am ef391cb9
: am 9cd816b3
: Merge "metricsd: Log the histogram name to hash mapping."
...
* commit 'ef391cb94a645277021b1b43d429611dbfe96666':
metricsd: Log the histogram name to hash mapping.
2015-09-03 18:14:04 +00:00
Bertrand Simonnet
706c0717f6
am 05b066e9
: am c1862479
: Merge "metricsd: Collect generic stats about the system."
...
* commit '05b066e93eadac5642a657379464e19418362e62':
metricsd: Collect generic stats about the system.
2015-09-03 18:14:03 +00:00
Yabin Cui
7d0b4ada0b
am 6562c151
: Merge "adb: clean up debug tracing a little."
...
* commit '6562c1513b2b7bd88da8b1d0c88b89e66b2dcd69':
adb: clean up debug tracing a little.
2015-09-03 17:38:57 +00:00
Bertrand Simonnet
ef391cb94a
am 9cd816b3
: Merge "metricsd: Log the histogram name to hash mapping."
...
* commit '9cd816b33d97f1a6427d6e265bbc58eb712178d0':
metricsd: Log the histogram name to hash mapping.
2015-09-03 17:38:56 +00:00
Bertrand Simonnet
05b066e93e
am c1862479
: Merge "metricsd: Collect generic stats about the system."
...
* commit 'c18624799b0dd832c0dd1f70455dd5912605291b':
metricsd: Collect generic stats about the system.
2015-09-03 17:38:54 +00:00
Jorge Lucangeli Obes
60350b8858
am efb4bb78
: am fd7a9f79
: am 66d32c74
: Merge "Use CAP_MASK_LONG for file capabilities."
...
* commit 'efb4bb78208939a89b8cc5316a2f55b903b38eb8':
Use CAP_MASK_LONG for file capabilities.
2015-09-03 17:37:19 +00:00
Tim Murray
6d6acf4afe
am c9b308d1
: am bb641d5f
: am bc8c731a
: Add zygote to the foreground cpuset.
...
* commit 'c9b308d155c181ae78489454f64877759de98170':
Add zygote to the foreground cpuset.
2015-09-03 17:36:28 +00:00
Yabin Cui
6562c1513b
Merge "adb: clean up debug tracing a little."
2015-09-03 17:32:44 +00:00
Bertrand Simonnet
9cd816b33d
Merge "metricsd: Log the histogram name to hash mapping."
2015-09-03 17:29:22 +00:00
Bertrand Simonnet
c18624799b
Merge "metricsd: Collect generic stats about the system."
2015-09-03 17:28:52 +00:00
Jorge Lucangeli Obes
efb4bb7820
am fd7a9f79
: am 66d32c74
: Merge "Use CAP_MASK_LONG for file capabilities."
...
* commit 'fd7a9f79f2e9f55da0768da2a7cc93ce6a006aa1':
Use CAP_MASK_LONG for file capabilities.
2015-09-03 16:07:05 +00:00
Jorge Lucangeli Obes
fd7a9f79f2
am 66d32c74
: Merge "Use CAP_MASK_LONG for file capabilities."
...
* commit '66d32c7488e12545218e83195738c95c183760ef':
Use CAP_MASK_LONG for file capabilities.
2015-09-03 15:55:32 +00:00
Jorge Lucangeli Obes
66d32c7488
Merge "Use CAP_MASK_LONG for file capabilities."
2015-09-03 15:48:01 +00:00
Ian Pedowitz
e9b04940f6
am 72b82fa0
: "resolved conflicts for merge of cd7d73fa
to mnc-dr-dev-plus-aosp"
...
* commit '72b82fa00dbfe5b3aaf937fda3d8ef272095dbfc':
DO NOT MERGE init: Fix parsing of multiple property triggers
2015-09-03 06:27:18 +00:00
Tim Murray
c9b308d155
am bb641d5f
: am bc8c731a
: Add zygote to the foreground cpuset.
...
* commit 'bb641d5f7714bdb8cd3ecc4f47cdd7c68e75d17a':
Add zygote to the foreground cpuset.
2015-09-03 06:22:42 +00:00
Ian Pedowitz
72b82fa00d
"resolved conflicts for merge of cd7d73fa
to mnc-dr-dev-plus-aosp"
...
Per chat with tomcherry, merge -s ours
2015-09-02 22:32:38 -07:00
Elliott Hughes
6874f7d643
am 25df278b
: am e7c37fb1
: am c5d278d4
: Merge "metricsd: Remove unused constant."
...
* commit '25df278b1f8f64a500051ecff2e9972ac17ba0f7':
metricsd: Remove unused constant.
2015-09-03 05:03:22 +00:00
Badhri Jagan Sridharan
d8cf000d6c
am b081b8cd
: am ddc296e8
: am e1801863
: init: usb: Add init scripts for configfs commands
...
* commit 'b081b8cdd17ef678fd84dccb9b5645bd72f26c5b':
init: usb: Add init scripts for configfs commands
2015-09-03 05:03:20 +00:00
Badhri Jagan Sridharan
5917b8a3bc
am 1c791dfd
: am 723b410f
: am 48d59acc
: init.usb.rc: Add new system property for configfs
...
* commit '1c791dfd3d8e5df380068dda0982ddb9149dcbd9':
init.usb.rc: Add new system property for configfs
2015-09-03 05:03:19 +00:00
Tim Murray
a89568c29e
am adef754b
: am 25a1b489
: am 4a1f02ea
: Merge "Add foreground/boost cpuset." into mnc-dr-dev
...
* commit 'adef754b4548b391c6c2cac3065c91ccaa783a1b':
Add foreground/boost cpuset.
2015-09-03 05:03:17 +00:00
Bertrand SIMONNET
160b5232e4
metricsd: Remove unused constant.
...
Change-Id: I214ea7ca5f63c253e4a02f0a7ac6e941b0c9ac5e
2015-09-02 21:39:40 -07:00
Elliott Hughes
25df278b1f
am e7c37fb1
: am c5d278d4
: Merge "metricsd: Remove unused constant."
...
* commit 'e7c37fb18d4e486ad6fddb52a1f93a71cc2f6b06':
metricsd: Remove unused constant.
2015-09-03 04:29:35 +00:00