Mark Salyzyn
2be6ebbedb
am e49aba54: am 95e7cb5b: Merge "healthd: logd: add timestamp to kernel logged battery messages"
...
* commit 'e49aba5413419bbc4f87889edd9a12956a932ef8':
healthd: logd: add timestamp to kernel logged battery messages
2015-08-12 14:29:05 +00:00
Mark Salyzyn
e49aba5413
am 95e7cb5b: Merge "healthd: logd: add timestamp to kernel logged battery messages"
...
* commit '95e7cb5b8e8fa67eb32377325fa6fa8472500baa':
healthd: logd: add timestamp to kernel logged battery messages
2015-08-12 14:25:19 +00:00
Mark Salyzyn
95e7cb5b8e
Merge "healthd: logd: add timestamp to kernel logged battery messages"
2015-08-12 14:17:38 +00:00
Elliott Hughes
ac5055af56
am 8bb6b3e1: am b62f6c2a: Merge "adb: call android::base::InitLogging even when adb tracing is disabled"
...
* commit '8bb6b3e1ffc44336f89eb30cc39a1e96498c7c23':
adb: call android::base::InitLogging even when adb tracing is disabled
2015-08-12 03:31:29 +00:00
Elliott Hughes
8bb6b3e1ff
am b62f6c2a: Merge "adb: call android::base::InitLogging even when adb tracing is disabled"
...
* commit 'b62f6c2a1cc9f7697abb6fc5c74565da6631e0dd':
adb: call android::base::InitLogging even when adb tracing is disabled
2015-08-12 03:23:22 +00:00
Elliott Hughes
b62f6c2a1c
Merge "adb: call android::base::InitLogging even when adb tracing is disabled"
2015-08-12 03:20:04 +00:00
Dan Albert
68ff9f2ca2
am e78292f2: am cef3508b: Merge "Add missing includes."
...
* commit 'e78292f2c5a1cffd9fdcb76e5be29f6d14445b93':
Add missing includes.
2015-08-12 02:11:05 +00:00
Dan Albert
e78292f2c5
am cef3508b: Merge "Add missing includes."
...
* commit 'cef3508bb69ec644f35de9d165dc91b127820d77':
Add missing includes.
2015-08-12 02:00:52 +00:00
Dan Albert
cef3508bb6
Merge "Add missing includes."
2015-08-12 01:50:15 +00:00
Mark Salyzyn
f51bc8d774
am c5482138: am ea56594c: Merge "logd: sizes > 1M prune in smaller batches"
...
* commit 'c54821388d685eff70a466cb01b2e8bb3e6c98fe':
logd: sizes > 1M prune in smaller batches
2015-08-12 00:04:35 +00:00
Mark Salyzyn
c54821388d
am ea56594c: Merge "logd: sizes > 1M prune in smaller batches"
...
* commit 'ea56594c947484f6d34729e85aaf4804d33dceea':
logd: sizes > 1M prune in smaller batches
2015-08-11 23:59:24 +00:00
Mark Salyzyn
ea56594c94
Merge "logd: sizes > 1M prune in smaller batches"
2015-08-11 23:51:31 +00:00
Dan Albert
af9ba4dc6c
Add missing includes.
...
Leaky header cleanup in libc++ means we don't get unistd.h
transitively any more.
Change-Id: I596c24eff418302b19afab6ad3caa55f52241e7c
2015-08-11 16:39:57 -07:00
Mark Salyzyn
62ab0fd4ef
logd: sizes > 1M prune in smaller batches
...
Switch to 1% batch sizes from 10% when individual buffer size > 1M
Bug: 22351810
Change-Id: Ifee570a54643ceb0ba767e1787e937f70cc90b72
2015-08-11 16:20:54 -07:00
Spencer Low
7430916098
adb: call android::base::InitLogging even when adb tracing is disabled
...
This is a follow-up to https://android-review.googlesource.com/153623
which prevented android::base::InitLogging() from being called when
tracing was disabled.
It is ok to call InitLogging() on a device or host because calling it
does not imply that a logging file is used, which was the reason for
not calling it on a device.
So this change should preserve the device behavior of not using a
logging file when tracing is disabled, plus it will call InitLogging()
all the time in case logging APIs are called.
Change-Id: I3fd6ba2c567f67a2f111a85f174893fbf866ec57
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
2015-08-11 15:48:15 -07:00
Elliott Hughes
d4fd61ef91
am 06a9f560: am 7989a7c8: Merge "adb: win32: fix USB device hang when resuming from sleep/hibernation"
...
* commit '06a9f560d2f19026c398b2ce66cd1ab76b2a4ae7':
adb: win32: fix USB device hang when resuming from sleep/hibernation
2015-08-11 21:55:56 +00:00
Elliott Hughes
06a9f560d2
am 7989a7c8: Merge "adb: win32: fix USB device hang when resuming from sleep/hibernation"
...
* commit '7989a7c8d32e90dc2cba952dc59da6b88cf55c8e':
adb: win32: fix USB device hang when resuming from sleep/hibernation
2015-08-11 21:49:08 +00:00
Elliott Hughes
7989a7c8d3
Merge "adb: win32: fix USB device hang when resuming from sleep/hibernation"
2015-08-11 21:43:32 +00:00
Tom Cherry
9b005a328b
am ba0f24c7: am 5573e3d8: Merge "init: replace strdup() in parse_config()"
...
* commit 'ba0f24c71767365ff730b763b9af257bad462809':
init: replace strdup() in parse_config()
2015-08-11 21:05:59 +00:00
Tom Cherry
ba0f24c717
am 5573e3d8: Merge "init: replace strdup() in parse_config()"
...
* commit '5573e3d839c25321bafe4390d03d0c1853cf5539':
init: replace strdup() in parse_config()
2015-08-11 20:59:40 +00:00
Tom Cherry
5573e3d839
Merge "init: replace strdup() in parse_config()"
2015-08-11 20:53:11 +00:00
Yusuke Sato
983cacea01
am 86ec2a88: am 162ec8e6: Merge "Ignore adb/*.pyc files"
...
* commit '86ec2a88101da0448480b132bf173e432f3c6297':
Ignore adb/*.pyc files
2015-08-11 20:15:18 +00:00
Yusuke Sato
86ec2a8810
am 162ec8e6: Merge "Ignore adb/*.pyc files"
...
* commit '162ec8e6377aef8671eaccfb8684a3850dc1c6df':
Ignore adb/*.pyc files
2015-08-11 20:08:59 +00:00
Yusuke Sato
162ec8e637
Merge "Ignore adb/*.pyc files"
2015-08-11 20:03:27 +00:00
Yusuke Sato
83cd266439
Ignore adb/*.pyc files
...
Python scripts in system/core/ such as perfboot.py may generate
the files.
Change-Id: I0506d47db414a678f1923e747ddce5acfcd7ce1b
2015-08-11 12:59:58 -07:00
Bertrand Simonnet
83c61cabc7
am e6a1dff2: am f71590ff: Merge "metricsd: Only define the targets on linux."
...
* commit 'e6a1dff215370491d0f683e323841a7c177ee4eb':
metricsd: Only define the targets on linux.
2015-08-11 19:04:46 +00:00
Bertrand Simonnet
e6a1dff215
am f71590ff: Merge "metricsd: Only define the targets on linux."
...
* commit 'f71590ffbc5b611a7c45fcddc7db3c1915fe3cd5':
metricsd: Only define the targets on linux.
2015-08-11 18:58:48 +00:00
Bertrand Simonnet
f71590ffbc
Merge "metricsd: Only define the targets on linux."
2015-08-11 18:54:41 +00:00
Bertrand SIMONNET
0a94a3bf1c
metricsd: Only define the targets on linux.
...
libchromeos (dependency of metricsd) is only defined for linux.
All metrics target must only be defined on mac too or the build system
will complain.
BUG: 22879597
Change-Id: I5bee816e001518a8053d1dfc7b39cca81a4314fd
2015-08-11 11:45:05 -07:00
Bertrand Simonnet
438e8be03a
am 92b100b3: am 3670eab0: Merge "metricsd: Add Android.mk."
...
* commit '92b100b3e772f4abb22091924e147eb924d80fed':
metricsd: Add Android.mk.
2015-08-11 18:21:55 +00:00
Bertrand Simonnet
92b100b3e7
am 3670eab0: Merge "metricsd: Add Android.mk."
...
* commit '3670eab0ba12471b8eddb894679cac824779dcb1':
metricsd: Add Android.mk.
2015-08-11 18:11:52 +00:00
Bertrand Simonnet
3670eab0ba
Merge "metricsd: Add Android.mk."
2015-08-11 18:05:35 +00:00
Elliott Hughes
67c750b7e0
am 3cc101d6: am e329a3ec: Merge "Remove watchprops."
...
* commit '3cc101d606c6a652955c08c6d3e200ed7c56b795':
Remove watchprops.
2015-08-11 03:02:48 +00:00
Elliott Hughes
3cc101d606
am e329a3ec: Merge "Remove watchprops."
...
* commit 'e329a3ec1b210d65ea33d67df1928dbffdb1d2d4':
Remove watchprops.
2015-08-11 02:56:35 +00:00
Elliott Hughes
e329a3ec1b
Merge "Remove watchprops."
2015-08-11 02:51:58 +00:00
Elliott Hughes
e8606c85c5
Remove watchprops.
...
Since watchprops would have to be rewritten anyway in the upcoming properties
rewrite, there seems little point in rewriting it for toybox first. Let's
see how many people actually use watchprops and decide whether it's worth
the effort...
Change-Id: I996e7209bc81633ee66602f09f130226336d9987
2015-08-10 19:27:18 -07:00
Elliott Hughes
b6018df133
am 61ff977b: am 1f36ae49: Merge "adb: win32: write ACK to separate pipe instead of stdout"
...
* commit '61ff977ba49f43d87fed86eb5b2e2bfc279f902b':
adb: win32: write ACK to separate pipe instead of stdout
2015-08-11 01:48:58 +00:00
Elliott Hughes
61ff977ba4
am 1f36ae49: Merge "adb: win32: write ACK to separate pipe instead of stdout"
...
* commit '1f36ae49b97d4b72fa9aca9bb6b4131acec5bccf':
adb: win32: write ACK to separate pipe instead of stdout
2015-08-11 01:44:47 +00:00
Elliott Hughes
1f36ae49b9
Merge "adb: win32: write ACK to separate pipe instead of stdout"
2015-08-11 01:38:55 +00:00
Elliott Hughes
9840e49159
am b6798ebb: am 5a1f9a3e: Merge "Remove the USB vendor id whitelist from fastboot."
...
* commit 'b6798ebbff08e2d2d0c1cc98a74b13976b4cdadc':
Remove the USB vendor id whitelist from fastboot.
2015-08-11 00:44:56 +00:00
Elliott Hughes
b6798ebbff
am 5a1f9a3e: Merge "Remove the USB vendor id whitelist from fastboot."
...
* commit '5a1f9a3ef033e85c35ba8e6df9810f95f287aa5f':
Remove the USB vendor id whitelist from fastboot.
2015-08-11 00:34:48 +00:00
Elliott Hughes
5a1f9a3ef0
Merge "Remove the USB vendor id whitelist from fastboot."
2015-08-11 00:28:21 +00:00
Bertrand SIMONNET
ed6ca6f8c6
metricsd: Add Android.mk.
...
This builds:
* metrics_client: command line interface to log metrics.
* libmetrics: shared library used by services to log metrics.
* metrics_daemon: background daemon responsible for aggregating the
metrics log and upload it periodically.
BUG: 22879597
Change-Id: I79adc4953d5bfd541df955fbc77d3549f5bbd26b
2015-08-10 15:57:39 -07:00
Gaurav Shah
e90e3cc949
am bd1b5f34: am cd285d7d: Merge "crash_reporter: Fix initial compile issues with Android toolchain"
...
* commit 'bd1b5f34def4d7f6066a6803503f1260db659c97':
crash_reporter: Fix initial compile issues with Android toolchain
2015-08-10 22:51:36 +00:00
Gaurav Shah
ca26b2ac7c
am 22f14b0f: am b889d7e4: Merge "crash_reporter: Remove Chrome collector, CrOS build files, DBus"
...
* commit '22f14b0fe420e4d77b66f207da0ff2068c863658':
crash_reporter: Remove Chrome collector, CrOS build files, DBus
2015-08-10 22:51:35 +00:00
Gaurav Shah
9b74ac9301
am 795ad6c7: am f06041d7: Merge "metricsd: Rename metrics to metricsd."
...
* commit '795ad6c74488f8f9f202010be4a0b3df30d2d0de':
metricsd: Rename metrics to metricsd.
2015-08-10 22:51:33 +00:00
Gaurav Shah
c170fcf8ed
am 0e8acc3c: am 011b2bc3: Merge "metrics: Add a CLI flag to disable dbus."
...
* commit '0e8acc3c1646fe49f594f211a3fba45a917c0633':
metrics: Add a CLI flag to disable dbus.
2015-08-10 22:51:32 +00:00
Gaurav Shah
1f981bb766
am fb44650a: am dc15f4cd: Merge "metrics: Enable for non-official builds."
...
* commit 'fb44650a03df364f8f46a9fe1c96b6a2321c2044':
metrics: Enable for non-official builds.
2015-08-10 22:51:30 +00:00
Gaurav Shah
bd1b5f34de
am cd285d7d: Merge "crash_reporter: Fix initial compile issues with Android toolchain"
...
* commit 'cd285d7d26e42eee91daf55be3378da595fee5ad':
crash_reporter: Fix initial compile issues with Android toolchain
2015-08-10 22:45:11 +00:00
Gaurav Shah
22f14b0fe4
am b889d7e4: Merge "crash_reporter: Remove Chrome collector, CrOS build files, DBus"
...
* commit 'b889d7e420eb0dcdda526259b54942e2aef28a0a':
crash_reporter: Remove Chrome collector, CrOS build files, DBus
2015-08-10 22:45:10 +00:00