Dan Albert
82b9e94173
am 1bcb4677
: am 71f878f8
: Merge "Move python-adb to development/python-packages."
...
* commit '1bcb4677b0a9aaf4c62db073bc878a7249c8028c':
Move python-adb to development/python-packages.
2015-09-21 17:42:11 +00:00
Dan Albert
1bcb4677b0
am 71f878f8
: Merge "Move python-adb to development/python-packages."
...
* commit '71f878f89b6bc6df960e857836467a059802c61e':
Move python-adb to development/python-packages.
2015-09-21 17:34:29 +00:00
Dan Albert
71f878f89b
Merge "Move python-adb to development/python-packages."
2015-09-21 17:26:15 +00:00
Narayan Kamath
8cbdd1fb9e
am f5db0689
: am 7fc499bb
: am 3f7a33a5
: am 26d47f26
: (-s ours) am 491035ce
: am 8253cb04
: am 0cc468dc
: am fef9dffd
: (-s ours) am 6c53de92
: Follow up to change b638126ed
DO NOT MERGE.
...
* commit 'f5db0689a0a898194577d456331ef7df936ddd44':
Follow up to change b638126ed
DO NOT MERGE.
2015-09-20 01:37:18 +00:00
Narayan Kamath
84c7ca7002
am 5ce847b2
: am 222a1562
: am dd0932e8
: am 81b428f2
: am db7d8e96
: am 68a78370
: am 2e64e959
: am a82d6dc3
: (-s ours) resolved conflicts for b638126e
to klp-modular-dev
...
* commit '5ce847b26168444724d6653ada89e9658c0bd0ba':
libutils: Fix integer overflows in VectorImpl. DO NOT MERGE
2015-09-20 01:37:17 +00:00
Narayan Kamath
f5db0689a0
am 7fc499bb
: am 3f7a33a5
: am 26d47f26
: (-s ours) am 491035ce
: am 8253cb04
: am 0cc468dc
: am fef9dffd
: (-s ours) am 6c53de92
: Follow up to change b638126ed
DO NOT MERGE.
...
* commit '7fc499bb7c060d2382517b4d0688a8c76198c0a8':
Follow up to change b638126ed
DO NOT MERGE.
2015-09-20 01:25:06 +00:00
Narayan Kamath
5ce847b261
am 222a1562
: am dd0932e8
: am 81b428f2
: am db7d8e96
: am 68a78370
: am 2e64e959
: am a82d6dc3
: (-s ours) resolved conflicts for b638126e
to klp-modular-dev
...
* commit '222a15622a63d11783bbc998c2c261adb3ad1bd1':
libutils: Fix integer overflows in VectorImpl. DO NOT MERGE
2015-09-20 01:25:06 +00:00
Brian Carlstrom
16bed9650a
am 742d0173
: am 661600dd
: am 110f705e
: resolved conflicts for 832a0d1c
to mnc-dev
...
* commit '742d0173e8bd41e137d175c04860c532270b3f5b':
libutils: Fix integer overflows in VectorImpl.
2015-09-20 01:21:47 +00:00
Brian Carlstrom
742d0173e8
am 661600dd
: am 110f705e
: resolved conflicts for 832a0d1c
to mnc-dev
...
* commit '661600dd0f0bf48289f69915c6b9844436702a90':
libutils: Fix integer overflows in VectorImpl.
2015-09-20 01:12:26 +00:00
Narayan Kamath
7fc499bb7c
am 3f7a33a5
: am 26d47f26
: (-s ours) am 491035ce
: am 8253cb04
: am 0cc468dc
: am fef9dffd
: (-s ours) am 6c53de92
: Follow up to change b638126ed
DO NOT MERGE.
...
* commit '3f7a33a5294cd59c331d5d036021141b6f1aef1e':
Follow up to change b638126ed
DO NOT MERGE.
2015-09-20 01:10:10 +00:00
Narayan Kamath
222a15622a
am dd0932e8
: am 81b428f2
: am db7d8e96
: am 68a78370
: am 2e64e959
: am a82d6dc3
: (-s ours) resolved conflicts for b638126e
to klp-modular-dev
...
* commit 'dd0932e831551d0a57a8af646ac0f9f386e4f579':
libutils: Fix integer overflows in VectorImpl. DO NOT MERGE
2015-09-20 01:10:09 +00:00
Brian Carlstrom
661600dd0f
am 110f705e
: resolved conflicts for 832a0d1c
to mnc-dev
...
* commit '110f705e1077b388a69814e9cdd2907a6ad7d5bb':
libutils: Fix integer overflows in VectorImpl.
2015-09-20 01:02:27 +00:00
Narayan Kamath
3f7a33a529
am 26d47f26
: (-s ours) am 491035ce
: am 8253cb04
: am 0cc468dc
: am fef9dffd
: (-s ours) am 6c53de92
: Follow up to change b638126ed
DO NOT MERGE.
...
* commit '26d47f2671e67968ea408417f03844681faf9455':
Follow up to change b638126ed
DO NOT MERGE.
2015-09-20 01:00:25 +00:00
Narayan Kamath
dd0932e831
am 81b428f2
: am db7d8e96
: am 68a78370
: am 2e64e959
: am a82d6dc3
: (-s ours) resolved conflicts for b638126e
to klp-modular-dev
...
* commit '81b428f27a74f693b7c19b873c3a5a9af69da641':
libutils: Fix integer overflows in VectorImpl. DO NOT MERGE
2015-09-20 01:00:24 +00:00
Brian Carlstrom
110f705e10
resolved conflicts for 832a0d1c
to mnc-dev
...
Change-Id: Ic46ee60de7bc500f4e1d5fe841524db80918a8d9
2015-09-19 17:29:42 -07:00
Narayan Kamath
26d47f2671
am 491035ce
: am 8253cb04
: am 0cc468dc
: am fef9dffd
: (-s ours) am 6c53de92
: Follow up to change b638126ed
DO NOT MERGE.
...
* commit '491035ce1ceec310f98347654ea17cafa6ccb520':
Follow up to change b638126ed
DO NOT MERGE.
2015-09-20 00:08:45 +00:00
Narayan Kamath
81b428f27a
am db7d8e96
: am 68a78370
: am 2e64e959
: am a82d6dc3
: (-s ours) resolved conflicts for b638126e
to klp-modular-dev
...
* commit 'db7d8e963c54246a2792e91c678bbe00fb2cc3aa':
libutils: Fix integer overflows in VectorImpl. DO NOT MERGE
2015-09-20 00:08:44 +00:00
Brian Carlstrom
832a0d1c64
resolved conflicts for cf676a86
to lmp-mr1-ub-dev
...
Change-Id: Ifd9a44777a472ae893f894391bff7ef81456d92c
2015-09-19 16:13:00 -07:00
Evgenii Stepanov
fbaaddc588
am 19584247
: am ee08fb53
: Merge "asan: update condition to work with multiple SANITIZE_TARGET values."
...
* commit '195842474a6722fdf2d967446b81d8accbd4648c':
asan: update condition to work with multiple SANITIZE_TARGET values.
2015-09-18 20:41:46 +00:00
Dan Albert
8858883388
Move python-adb to development/python-packages.
...
We want to be able to use this in the NDK without having to pull in
all of system core.
Also, this clarifies the separation of adb and its python interface.
Bug: http://b/22881740
Change-Id: I0b437d9bf621e371d4698d7f8e8828072c7ff347
2015-09-18 13:39:13 -07:00
Evgenii Stepanov
195842474a
am ee08fb53
: Merge "asan: update condition to work with multiple SANITIZE_TARGET values."
...
* commit 'ee08fb53bb59cb5037755d68de09e6e5bc3f8bc6':
asan: update condition to work with multiple SANITIZE_TARGET values.
2015-09-18 20:31:52 +00:00
Evgenii Stepanov
ee08fb53bb
Merge "asan: update condition to work with multiple SANITIZE_TARGET values."
2015-09-18 20:23:52 +00:00
Tim Murray
cba6ad7449
add system-background cpuset
...
add a new cpuset for system services that should not run on
larger cores
bug 24144797
Change-Id: I21a54f0d6b46b3b8bd8c4564b8685c88cfc4a57d
2015-09-18 13:18:49 -07:00
Ivan Krasin
5039d8cd21
asan: update condition to work with multiple SANITIZE_TARGET values.
...
The goal is to enable SANITIZE_TARGET='address coverage', which
will be used by LLVMFuzzer.
Bug: 22850550
Change-Id: Iea756eaaedaa56aee4daf714510269efe3aaa553
2015-09-18 11:59:46 -07:00
Yabin Cui
963a3e15f6
am 84c5dd0f
: am 94c617cc
: Merge "Revert "Add BacktraceOffline for offline backtracing.""
...
* commit '84c5dd0f17872ceb052af00a8742a35590468da4':
Revert "Add BacktraceOffline for offline backtracing."
2015-09-17 23:12:38 +00:00
Yabin Cui
84c5dd0f17
am 94c617cc
: Merge "Revert "Add BacktraceOffline for offline backtracing.""
...
* commit '94c617ccbba4db673a6c4cc682927e630a8feaf0':
Revert "Add BacktraceOffline for offline backtracing."
2015-09-17 23:06:42 +00:00
Narayan Kamath
491035ce1c
am 8253cb04
: am 0cc468dc
: am fef9dffd
: (-s ours) am 6c53de92
: Follow up to change b638126ed
DO NOT MERGE.
...
* commit '8253cb0436a09dcb325dbdecf4689b0a18b25644':
Follow up to change b638126ed
DO NOT MERGE.
2015-09-17 23:03:11 +00:00
Narayan Kamath
db7d8e963c
am 68a78370
: am 2e64e959
: am a82d6dc3
: (-s ours) resolved conflicts for b638126e
to klp-modular-dev
...
* commit '68a7837088c40e367ebf16959adc9d20d06ef0ea':
libutils: Fix integer overflows in VectorImpl. DO NOT MERGE
2015-09-17 23:03:10 +00:00
Narayan Kamath
cf676a8686
am 52edd8bd
: am 419e6c3c
: libutils: Fix integer overflows in VectorImpl.
...
* commit '52edd8bdf3e83f41f4df4bb5e9e44d0bc0c56a37':
libutils: Fix integer overflows in VectorImpl.
2015-09-17 23:01:45 +00:00
Yabin Cui
94c617ccbb
Merge "Revert "Add BacktraceOffline for offline backtracing.""
2015-09-17 22:58:36 +00:00
Yabin Cui
ab5e583327
Revert "Add BacktraceOffline for offline backtracing."
...
Using llvm makes libbacktrace stops building for 32 bit on linux host x86_64.
This reverts commit c9c6b6ee77
.
Change-Id: Ieb807db881d7bb3132cd09e25fd08c28766ca0a8
2015-09-17 22:54:22 +00:00
Yabin Cui
d1c3e69a48
am fe965294
: am ee645af4
: Merge "Add BacktraceOffline for offline backtracing."
...
* commit 'fe9652946e6635111a924986b7b23467ddc5b71e':
Add BacktraceOffline for offline backtracing.
2015-09-17 22:31:43 +00:00
Yabin Cui
fe9652946e
am ee645af4
: Merge "Add BacktraceOffline for offline backtracing."
...
* commit 'ee645af487e8611bcc80a4fad841bdd05e36e9f3':
Add BacktraceOffline for offline backtracing.
2015-09-17 22:22:31 +00:00
Elliott Hughes
15b9dbad7f
am 8fd98104
: am a951a82d
: Merge "adb unittest for win32 handle inheritance"
...
* commit '8fd981040d6396d74ccbaafbb28688aedc34e6bb':
adb unittest for win32 handle inheritance
2015-09-17 22:20:23 +00:00
Elliott Hughes
8fd981040d
am a951a82d
: Merge "adb unittest for win32 handle inheritance"
...
* commit 'a951a82dcc9cbefb4162a048d5d668dcb855cbf5':
adb unittest for win32 handle inheritance
2015-09-17 22:08:42 +00:00
Yabin Cui
ee645af487
Merge "Add BacktraceOffline for offline backtracing."
2015-09-17 22:07:04 +00:00
Elliott Hughes
a951a82dcc
Merge "adb unittest for win32 handle inheritance"
2015-09-17 22:04:17 +00:00
Steve Fung
ba2c73c18c
am 331cc9a8
: am 557aa2e9
: Merge "crash_reporter: Generate and use own guid"
...
* commit '331cc9a828293bfff8b5083c9e59a6f478d66df1':
crash_reporter: Generate and use own guid
2015-09-17 20:10:28 +00:00
Steve Fung
331cc9a828
am 557aa2e9
: Merge "crash_reporter: Generate and use own guid"
...
* commit '557aa2e9987fd832e4ce14b9e1421851f25ca60f':
crash_reporter: Generate and use own guid
2015-09-17 19:59:09 +00:00
Dan Willemsen
17a366956b
am e0506e0d
: am 9721bb4c
: Merge "Add Android.bp for liblog"
...
* commit 'e0506e0ddc9ee080c813f3449601f99b2d7ce586':
Add Android.bp for liblog
2015-09-17 19:52:49 +00:00
Steve Fung
557aa2e998
Merge "crash_reporter: Generate and use own guid"
2015-09-17 19:51:51 +00:00
Dan Willemsen
e0506e0ddc
am 9721bb4c
: Merge "Add Android.bp for liblog"
...
* commit '9721bb4c9b0ea6fb260f3d9015b408b8b42fa634':
Add Android.bp for liblog
2015-09-17 19:40:40 +00:00
Dan Willemsen
9721bb4c9b
Merge "Add Android.bp for liblog"
2015-09-17 19:30:50 +00:00
Bertrand Simonnet
d9f7a1c298
am 473604c1
: am ccdd012f
: Merge "metricsd: Fix CumulativeUseTime metrics."
...
* commit '473604c1c2b4e08f2fd904dea08f40c26d6f8604':
metricsd: Fix CumulativeUseTime metrics.
2015-09-17 18:31:48 +00:00
Bertrand Simonnet
473604c1c2
am ccdd012f
: Merge "metricsd: Fix CumulativeUseTime metrics."
...
* commit 'ccdd012ff360e8a04055cdb9dbead282cca839d3':
metricsd: Fix CumulativeUseTime metrics.
2015-09-17 18:23:44 +00:00
Bertrand Simonnet
ccdd012ff3
Merge "metricsd: Fix CumulativeUseTime metrics."
2015-09-17 18:13:13 +00:00
Bertrand SIMONNET
2d03783ccc
metricsd: Fix CumulativeUseTime metrics.
...
This fixes three things:
* name of the metrics: the metrics does not represent the daily use.
* arithmetic error: we collect the use time in seconds so no need to
divide by 1000 to get seconds.
* the metrics should not be reset daily.
This CL also renames the Send* helper methods to be more explicit about
resetting the counters.
This was also committed in Chrome OS at:
https://chromium-review.googlesource.com/#/c/300059/ .
BUG:24131693
TEST: unit tests.
Change-Id: I712baa1fd639b9b0df60906d94a0904d8c6760aa
2015-09-17 09:39:34 -07:00
Spencer Low
1ce06087db
adb unittest for win32 handle inheritance
...
adb.cpp: launch_server() has a long comment about how
stdin/stdout/stderr handles have to be made non-inheritable to prevent
hangs in callers to adb.exe.
It would be disastrous to do this wrong, and I've modified this code, so
here's a unittest to verify that I'm doing it right.
The test also runs fine on unix.
Change-Id: I3672c3066bc7498635c19212f9e5c50757942439
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
2015-09-16 20:50:53 -07:00
Elliott Hughes
8057b81e22
am 09a0d98b
: am 1d758c90
: Merge "adb unittest: make test_sync properly cleanup after itself"
...
* commit '09a0d98bebce23f014ea11af002c1fafaf6b8065':
adb unittest: make test_sync properly cleanup after itself
2015-09-17 03:17:27 +00:00
Elliott Hughes
09a0d98beb
am 1d758c90
: Merge "adb unittest: make test_sync properly cleanup after itself"
...
* commit '1d758c90959225c76ed4d318290ad1bf11532409':
adb unittest: make test_sync properly cleanup after itself
2015-09-17 03:10:54 +00:00