Mark Salyzyn
982bbea061
am 2a04ec35: am 07ee12aa: Merge "logd: worst uid record watermark"
...
* commit '2a04ec3546a7f1d82b927dd2f49fe46f13f5fe2c':
logd: worst uid record watermark
2015-08-20 19:32:37 +00:00
Mark Salyzyn
76cbf5f37f
am 44a7da74: am 2c1b8f9e: Merge changes Ib0530b9d,I981d9fa6,Icc60dd06,I902ba6b4
...
* commit '44a7da74bd841eee680870433c1baf82325fb51e':
logd: log buffer switch to std::list
logd: white and black switch to std::list
logd: logtimes switch to std::list
logd: prune 10% or 256 entries max
2015-08-20 19:32:33 +00:00
Elliott Hughes
425702fa23
am 89b26e28: am e03d0322: Merge "fastboot should say which device it\'s waiting for."
...
* commit '89b26e28a87d86b501ecfc1b4a9fbfb8e955a0ae':
fastboot should say which device it's waiting for.
2015-08-20 19:31:34 +00:00
Elliott Hughes
338c8669f7
am 2a2c2036: am e728eb91: Merge "Get fastboot working on OS X"
...
* commit '2a2c2036a75f1dcee9a4a65a03e646b05df76ab4':
Get fastboot working on OS X
2015-08-20 19:31:33 +00:00
Mark Salyzyn
2a04ec3546
am 07ee12aa: Merge "logd: worst uid record watermark"
...
* commit '07ee12aafc9ed0cbadbfa3c29a31c9854e07b4b9':
logd: worst uid record watermark
2015-08-20 17:41:05 +00:00
Mark Salyzyn
07ee12aafc
Merge "logd: worst uid record watermark"
2015-08-20 17:35:19 +00:00
Mark Salyzyn
c892ea3fa8
logd: worst uid record watermark
...
Hold on to last worst uid watermark and bypass a spike to O(n*n*x)
(n=samples, x=number of spammers) wrt chatty trimming.
Bug: 23327476
Change-Id: I9f21ce95e969b67e576417a760f75c4d86acf364
2015-08-20 10:25:57 -07:00
Mark Salyzyn
44a7da74bd
am 2c1b8f9e: Merge changes Ib0530b9d,I981d9fa6,Icc60dd06,I902ba6b4
...
* commit '2c1b8f9e200abdbc42addd33829616393067b96a':
logd: log buffer switch to std::list
logd: white and black switch to std::list
logd: logtimes switch to std::list
logd: prune 10% or 256 entries max
2015-08-20 17:18:51 +00:00
Mark Salyzyn
2c1b8f9e20
Merge changes Ib0530b9d,I981d9fa6,Icc60dd06,I902ba6b4
...
* changes:
logd: log buffer switch to std::list
logd: white and black switch to std::list
logd: logtimes switch to std::list
logd: prune 10% or 256 entries max
2015-08-20 17:12:05 +00:00
Mark Salyzyn
94a89c42fe
logd: log buffer switch to std::list
...
Bug: 23350706
Bug: 23327476
Change-Id: Ib0530b9dd5842c6d05c84d7a66f2531c97461067
2015-08-20 08:36:13 -07:00
Mark Salyzyn
e0ed16c6db
logd: white and black switch to std::list
...
Bug: 23350706
Change-Id: I981d9fa63a0d87eb309485cca93cfc44fc0506cc
2015-08-20 08:36:08 -07:00
Mark Salyzyn
98dca2d0b1
logd: logtimes switch to std::list
...
Bug: 23350706
Change-Id: Icc60dd06119ea20a22610644ff880d5135363aba
2015-08-20 08:36:03 -07:00
Mark Salyzyn
b39ed0c992
logd: prune 10% or 256 entries max
...
Bug: 22351810
Bug: 23327476
Change-Id: I902ba6b431d8b7cee2d65ee2f76e9f7c4f30b152
2015-08-20 08:35:45 -07:00
Elliott Hughes
89b26e28a8
am e03d0322: Merge "fastboot should say which device it\'s waiting for."
...
* commit 'e03d0322db8ed123254482d0b0905646b16ad71e':
fastboot should say which device it's waiting for.
2015-08-20 00:57:41 +00:00
Elliott Hughes
2a2c2036a7
am e728eb91: Merge "Get fastboot working on OS X"
...
* commit 'e728eb9150f38fc5c6f8324ef785a152344973a8':
Get fastboot working on OS X
2015-08-20 00:53:08 +00:00
Elliott Hughes
e03d0322db
Merge "fastboot should say which device it's waiting for."
2015-08-20 00:52:50 +00:00
Elliott Hughes
b46964f3c9
fastboot should say which device it's waiting for.
...
Change-Id: Ia8a04b2727983cb05a9a3e85d9a9586b15c71600
2015-08-19 17:49:45 -07:00
Elliott Hughes
e728eb9150
Merge "Get fastboot working on OS X"
2015-08-20 00:44:30 +00:00
Daniel Erat
f10e1ed1b2
am 2e406f64: am 9a995b2c: Merge "Use __ANDROID__ instead of __BRILLO__."
...
* commit '2e406f64bd01395977c66c4afc518b61841f507c':
Use __ANDROID__ instead of __BRILLO__.
2015-08-20 00:01:31 +00:00
Daniel Erat
2e406f64bd
am 9a995b2c: Merge "Use __ANDROID__ instead of __BRILLO__."
...
* commit '9a995b2c8fe4ee0567e850f7f63bfd661974f6e7':
Use __ANDROID__ instead of __BRILLO__.
2015-08-19 23:55:00 +00:00
Daniel Erat
9a995b2c8f
Merge "Use __ANDROID__ instead of __BRILLO__."
2015-08-19 23:47:47 +00:00
Daniel Erat
69200d9191
Use __ANDROID__ instead of __BRILLO__.
...
__ANDROID__ is defined automatically by the toolchain.
Bug: 23358460
Change-Id: Ib122bfc86a7af6ab6b0b1fcc29dc671e44049524
2015-08-19 17:38:45 -06:00
Steve Fung
61c677c8ca
am cbc6b915: am d4555689: Merge "crash_reporter: Enable core dumps"
...
* commit 'cbc6b915c90b31c2c1cc9a56d23280ac51f6d329':
crash_reporter: Enable core dumps
2015-08-19 22:43:12 +00:00
Steve Fung
cbc6b915c9
am d4555689: Merge "crash_reporter: Enable core dumps"
...
* commit 'd45556895c957e3f50d93041207acf4b17433ec5':
crash_reporter: Enable core dumps
2015-08-19 22:36:42 +00:00
Bertrand Simonnet
6905b11291
am cb1e29a9: am 0172dea6: Merge "metrics: Add init script for metrics_daemon."
...
* commit 'cb1e29a940801a06aed47335494cbfbe5e2921a8':
metrics: Add init script for metrics_daemon.
2015-08-19 22:35:55 +00:00
Steve Fung
d45556895c
Merge "crash_reporter: Enable core dumps"
2015-08-19 22:32:38 +00:00
Yusuke Sato
2ef82cffad
am d1b11a04: am e656be33: Merge "Add |opts| argument to android_fork_execvp_ext"
...
* commit 'd1b11a04903be74ba6a47307d8c3ef2731e3f4ab':
Add |opts| argument to android_fork_execvp_ext
2015-08-19 22:31:08 +00:00
Bertrand Simonnet
cb1e29a940
am 0172dea6: Merge "metrics: Add init script for metrics_daemon."
...
* commit '0172dea6eee180ae7492c1b85113222dcbabf61b':
metrics: Add init script for metrics_daemon.
2015-08-19 22:28:53 +00:00
Bertrand Simonnet
0172dea6ee
Merge "metrics: Add init script for metrics_daemon."
2015-08-19 22:21:26 +00:00
Matt Reimer
81c24f6f86
Get fastboot working on OS X
...
Get fastboot working on OS X by calling USBDeviceOpen() before
calling SetConfiguration().
Change-Id: I5034721d5f33ef18273153ff40eb940baa8261cd
2015-08-19 14:46:17 -07:00
Yusuke Sato
d1b11a0490
am e656be33: Merge "Add |opts| argument to android_fork_execvp_ext"
...
* commit 'e656be3313fa30adf9be149584d2005a7824f763':
Add |opts| argument to android_fork_execvp_ext
2015-08-19 20:30:49 +00:00
Yusuke Sato
e656be3313
Merge "Add |opts| argument to android_fork_execvp_ext"
2015-08-19 20:23:43 +00:00
Bertrand SIMONNET
73eaa46559
metrics: Add init script for metrics_daemon.
...
This init script creates the metrics data directory (/data/misc/metrics)
and starts the daemon.
BUG: 22953527
Change-Id: I21cd36f38a7a3550bc755cef5699e9a6ac3dfb94
2015-08-19 11:32:41 -07:00
Yusuke Sato
d81c3c6c45
Add |opts| argument to android_fork_execvp_ext
...
to allow the caller to send data to the child's stdin.
Bug: 21725996
Change-Id: I818f5cf61045286c8d64a91b6d50f05740329be1
2015-08-19 11:00:37 -07:00
Steve Fung
ab2ac7d114
crash_reporter: Enable core dumps
...
Fix various path/directory locations to their Android equivalents
to enable collection of core dumps and generation of mini dumps
to work correctly. Also add the init script to initialize
crash_reporter.
Bug: 22874832
Change-Id: Iffb1529e5259c5da5ba7f6977b2787e738f68a78
2015-08-18 23:38:27 -07:00
Elliott Hughes
22b510adc5
am 2b0deb91: am a169f3b4: Merge "adb: win32: fix unittest exit code parsing"
...
* commit '2b0deb91c3dca2b7b2a5ef0445fed73db63a922d':
adb: win32: fix unittest exit code parsing
2015-08-19 03:50:09 +00:00
Elliott Hughes
2b0deb91c3
am a169f3b4: Merge "adb: win32: fix unittest exit code parsing"
...
* commit 'a169f3b40167df757b24464ceddcfc0e2f548c4f':
adb: win32: fix unittest exit code parsing
2015-08-19 03:43:09 +00:00
Elliott Hughes
a169f3b401
Merge "adb: win32: fix unittest exit code parsing"
2015-08-19 03:37:23 +00:00
Elliott Hughes
6cec026e86
am 8c86e4e2: am d0cae5b9: Merge "Remove a HAVE_MS_C_RUNTIME I missed."
...
* commit '8c86e4e2c075c7a879a9f73b56ab075dde61176a':
Remove a HAVE_MS_C_RUNTIME I missed.
2015-08-19 01:39:16 +00:00
Elliott Hughes
8c86e4e2c0
am d0cae5b9: Merge "Remove a HAVE_MS_C_RUNTIME I missed."
...
* commit 'd0cae5b9fead406c38df5dd55bd7d41fe22a6719':
Remove a HAVE_MS_C_RUNTIME I missed.
2015-08-19 01:31:51 +00:00
Elliott Hughes
d0cae5b9fe
Merge "Remove a HAVE_MS_C_RUNTIME I missed."
2015-08-19 01:26:26 +00:00
Elliott Hughes
27507d8ba1
Remove a HAVE_MS_C_RUNTIME I missed.
...
Change-Id: I063c6c802b8967d812d4f4a0972f00b0a88704af
2015-08-18 18:03:04 -07:00
Sergio Giro
4d8c1d2223
am f468d1e1: am 1d44be87: Merge "libutils: fix overflow in String8::allocFromUTF8"
...
* commit 'f468d1e14c0bb777d557a6a86dead260e40ff8aa':
libutils: fix overflow in String8::allocFromUTF8
2015-08-18 17:25:08 +00:00
Sergio Giro
f468d1e14c
am 1d44be87: Merge "libutils: fix overflow in String8::allocFromUTF8"
...
* commit '1d44be87ffdc5e3bc074ab68200bff9d32c60d3a':
libutils: fix overflow in String8::allocFromUTF8
2015-08-18 17:21:11 +00:00
Sergio Giro
ba71601aac
am 29c12755: Merge "libutils: fix overflow in String8::allocFromUTF8" into mnc-dev
...
* commit '29c1275519ef85fa3f30be351f19dc6e7eedbee9':
libutils: fix overflow in String8::allocFromUTF8
2015-08-18 17:19:10 +00:00
Sergio Giro
29c1275519
Merge "libutils: fix overflow in String8::allocFromUTF8" into mnc-dev
2015-08-18 17:15:11 +00:00
Sergio Giro
ebabef2752
libutils: fix overflow in String8::allocFromUTF8
...
Patch contributed in:
https://code.google.com/p/android/issues/detail?id=182908
Bug: 23290056
(cherry picked from commit 4eeacbeec0 )
Change-Id: Ife1dc0791040150132bea6884f1e6c8d31972d1b
2015-08-18 18:06:38 +01:00
Sergio Giro
1d44be87ff
Merge "libutils: fix overflow in String8::allocFromUTF8"
2015-08-18 17:04:07 +00:00
Sergio Giro
4eeacbeec0
libutils: fix overflow in String8::allocFromUTF8
...
Patch contributed in:
https://code.google.com/p/android/issues/detail?id=182908
Bug: 23290056
Change-Id: Ide0e9a8acc4e95a9104bab3ae803aa3a40098222
2015-08-18 14:44:54 +01:00
Yusuke Sato
8e9a1ae593
am 885400fd: am 4d09db9d: Merge "perfboot.py: Add --end-tag option"
...
* commit '885400fdbabf9850bd680725c591cc00f2aa71fe':
perfboot.py: Add --end-tag option
2015-08-18 05:55:28 +00:00