Sreeram Ramachandran
f8733c63aa
am 08c08f72
: Merge "Move netd_client into netd."
...
* commit '08c08f72617b13696049bf295646d6a68f3f1a8c':
Move netd_client into netd.
2014-05-21 17:01:39 +00:00
Sreeram Ramachandran
08c08f7261
Merge "Move netd_client into netd."
2014-05-21 16:59:51 +00:00
Sreeram Ramachandran
91dc3369d3
Move netd_client into netd.
...
(cherry picked from commit f1b21c5c73
)
Change-Id: Ie4b6b303225c93f2448a503d6ea9cebb552cbad5
2014-05-21 09:26:57 -07:00
Mark Salyzyn
e2fb764c3b
am 36ccca15
: Merge "toolbox: turn on -Werror"
...
* commit '36ccca155c03053397b953e4cc0ed8a8338d2450':
toolbox: turn on -Werror
2014-05-21 15:42:48 +00:00
Mark Salyzyn
36ccca155c
Merge "toolbox: turn on -Werror"
2014-05-21 15:40:14 +00:00
Elliott Hughes
6dfb039b0b
am 4a343436
: Merge "Fix win32 undefined reference to `_socket_network_client_timeout\'."
...
* commit '4a343436e01b07c21c043f8a903689f70000ca73':
Fix win32 undefined reference to `_socket_network_client_timeout'.
2014-05-20 19:21:36 +00:00
Elliott Hughes
4a343436e0
Merge "Fix win32 undefined reference to `_socket_network_client_timeout'."
2014-05-20 19:18:11 +00:00
Elliott Hughes
0bff5bd952
Fix win32 undefined reference to `_socket_network_client_timeout'.
...
Change-Id: I063213957b8452f4690da0f64872075f7c27b4cd
2014-05-20 12:13:29 -07:00
Ben Cheng
7563a601e4
am 3816305b
: Merge "Address additional warnings found by GCC 4.9."
...
* commit '3816305b58b0eeb098f2f989ef03208d1f29f4da':
Address additional warnings found by GCC 4.9.
2014-05-20 18:09:57 +00:00
Ben Cheng
3816305b58
Merge "Address additional warnings found by GCC 4.9."
2014-05-20 17:53:18 +00:00
Ben Cheng
43232920f3
Address additional warnings found by GCC 4.9.
...
Change-Id: I8aae6c3e1ccc2294f4db455e1b4f3b4c34a00aaf
2014-05-20 10:51:02 -07:00
Elliott Hughes
796b20157f
am 51e27f95
: Merge "Fix win32 implicit declaration of function socket_network_client_timeout."
...
* commit '51e27f955b79846e36097532a725f4b7a3eefef8':
Fix win32 implicit declaration of function socket_network_client_timeout.
2014-05-20 15:55:43 +00:00
Elliott Hughes
51e27f955b
Merge "Fix win32 implicit declaration of function socket_network_client_timeout."
2014-05-20 15:52:59 +00:00
Elliott Hughes
b911cf0af4
Fix win32 implicit declaration of function socket_network_client_timeout.
...
Change-Id: Ic6070855a21920384c555c9c82b9a2e4a776cbae
2014-05-20 08:51:15 -07:00
Elliott Hughes
2dea56e05c
am 9e0a6248
: Merge "Fix Windows socket_network_client.c build failures."
...
* commit '9e0a62487b9946c0403d6c4282010d28ae0b193e':
Fix Windows socket_network_client.c build failures.
2014-05-19 23:50:28 +00:00
Elliott Hughes
9e0a62487b
Merge "Fix Windows socket_network_client.c build failures."
2014-05-19 23:48:10 +00:00
Elliott Hughes
36739556db
Fix Windows socket_network_client.c build failures.
...
Change-Id: Ie67a2305ade02e078bf0edf54104c295b091b1b7
2014-05-19 16:47:12 -07:00
Elliott Hughes
0e71e3ab9c
am 9cae50b3
: Merge "Bound the ADB connect time with a non-blocking connect"
...
* commit '9cae50b38d6a58efe0799ef3697f594cb4b100f9':
Bound the ADB connect time with a non-blocking connect
2014-05-19 23:22:21 +00:00
Elliott Hughes
9cae50b38d
Merge "Bound the ADB connect time with a non-blocking connect"
2014-05-19 23:18:49 +00:00
Ken Lierman
aecc6a6657
Bound the ADB connect time with a non-blocking connect
...
After a disconnect, the initial blocking connect takes
a long time to return, while subsequent calls return
quicks. Switch to a non-blocking connect to make the
re-connect time more consistent and faster overall.
Change-Id: I21d02b22a8eb9a457c2f1fa95eb17894d5612ccd
Signed-off-by: Ken Lierman <ken.lierman@windriver.com>
Reviewed-by: Gumbel, Matthew K <matthew.k.gumbel@intel.com>
Reviewed-by: Jovanovic, Radivoje <radivoje.jovanovic@intel.com>
Reviewed-by: Boie, Andrew P <andrew.p.boie@intel.com>
2014-05-19 16:16:42 -07:00
Dan Albert
5b654f1531
am 201bf676
: Merge "Really fixes the ub branches"
...
* commit '201bf6769fec1bb01446d25e6efad0bf10c39296':
Really fixes the ub branches
2014-05-19 22:37:29 +00:00
Dan Albert
201bf6769f
Merge "Really fixes the ub branches"
2014-05-19 22:34:06 +00:00
Dan Albert
ad51136267
Really fixes the ub branches
...
Change-Id: I1d78f4e6c1d8086c2895f6739c3202e9ef74fee2
2014-05-19 14:49:13 -07:00
Dan Albert
121f209d3e
am e1efe23f
: Merge "Fix unbundled branches"
...
* commit 'e1efe23ff718d25c5f3d5ef7914f05f8f739eee5':
Fix unbundled branches
2014-05-19 19:24:28 +00:00
Dan Albert
e1efe23ff7
Merge "Fix unbundled branches"
2014-05-19 19:21:37 +00:00
Dan Albert
a8b8460220
Fix unbundled branches
...
Change-Id: Ic8a58a6cf55221ec361bbb80c7c9636fe1349943
2014-05-19 11:40:27 -07:00
Dan Albert
888f95e2e2
am f03bd953
: Merge "Adds libc++ versions of libbacktrace"
...
* commit 'f03bd9537b77f996cddd562d88558151d3d6c7fd':
Adds libc++ versions of libbacktrace
2014-05-19 18:23:08 +00:00
Dan Albert
f03bd9537b
Merge "Adds libc++ versions of libbacktrace"
2014-05-19 18:19:08 +00:00
Dan Albert
40a46dde9c
Adds libc++ versions of libbacktrace
...
Change-Id: I4a1ce30e7c2166ac1846cc90de0252beee542ee6
2014-05-19 10:23:16 -07:00
Elliott Hughes
343e49e334
am 0296be9d
: Merge "Teach debuggerd the name of SIGTRAP."
...
* commit '0296be9d98fa429a17c90d4ec4d0becb18b9f8ec':
Teach debuggerd the name of SIGTRAP.
2014-05-17 06:37:09 +00:00
Elliott Hughes
0296be9d98
Merge "Teach debuggerd the name of SIGTRAP."
2014-05-17 06:23:15 +00:00
Elliott Hughes
a323b504a7
Teach debuggerd the name of SIGTRAP.
...
Also add SIGTRAP to the list of signals we don't want to double fault on.
Bug: 15024256
Change-Id: I23ab80800563c007fcd3e42527329fedf762f0c8
2014-05-16 21:12:17 -07:00
Elliott Hughes
2f1cddfd1f
am 541859db
: Merge "Remove the broken LED flashing code from debuggerd."
...
* commit '541859dbf710946f03999a962e85c4ca3d5c816a':
Remove the broken LED flashing code from debuggerd.
2014-05-17 04:04:00 +00:00
Elliott Hughes
541859dbf7
Merge "Remove the broken LED flashing code from debuggerd."
2014-05-17 04:02:40 +00:00
Elliott Hughes
27ab751c7b
Remove the broken LED flashing code from debuggerd.
...
Change-Id: I4d0cbe14daa90ac5f91ce4597584448ee3c65dda
2014-05-16 20:54:36 -07:00
Elliott Hughes
a04bad63b9
am 9cb0b571
: Merge "Output correct gdbserver instructions from debuggerd."
...
* commit '9cb0b5719c0ac5fefc043f0c61b1640e058b7793':
Output correct gdbserver instructions from debuggerd.
2014-05-17 03:37:45 +00:00
Elliott Hughes
9cb0b5719c
Merge "Output correct gdbserver instructions from debuggerd."
2014-05-17 03:34:38 +00:00
Elliott Hughes
d9bf2b2137
Output correct gdbserver instructions from debuggerd.
...
Bug: 15021938
Change-Id: I2df433d939f5f83ed2a2a30af357b83e4d8e5331
2014-05-16 19:51:41 -07:00
Ying Wang
b0501ab66d
am 770cd7c7
: Merge "Fix host 64-bit build."
...
* commit '770cd7c7e7c18a657f233d86aeecb1d9f3091449':
Fix host 64-bit build.
2014-05-17 01:34:38 +00:00
Ying Wang
770cd7c7e7
Merge "Fix host 64-bit build."
2014-05-17 01:31:29 +00:00
Elliott Hughes
5e74210732
am c4afc192
: Merge "Add SIGTRAP support to crasher and debuggerd."
...
* commit 'c4afc19236ae7253acc3266b4ca8515473e9c7cc':
Add SIGTRAP support to crasher and debuggerd.
2014-05-17 00:42:36 +00:00
Elliott Hughes
c4afc19236
Merge "Add SIGTRAP support to crasher and debuggerd."
2014-05-17 00:39:22 +00:00
Elliott Hughes
7e35ae8fc8
Add SIGTRAP support to crasher and debuggerd.
...
Bug: 15024256
Change-Id: I3f34993fcfd9799306852b0a2195db468370be6e
2014-05-16 17:27:59 -07:00
Colin Cross
3277dc2698
am 2d03a498
: Merge "correct the setenv option judging condition"
...
* commit '2d03a498f9a1258740a9bbf6b28882506cde3ad9':
correct the setenv option judging condition
2014-05-16 20:49:37 +00:00
Colin Cross
2d03a498f9
Merge "correct the setenv option judging condition"
2014-05-16 20:47:15 +00:00
Gavin.Chang
c3a4676c7f
correct the setenv option judging condition
...
Change-Id: I10ed6275374f572da639f26611f607bf7607905c
2014-05-16 20:46:58 +00:00
Mark Salyzyn
24786645d6
am bc741ac2
: Merge "logd: logcat: debuggerd: auditd logs to events"
...
* commit 'bc741ac2126727d9de33042fa308307690efe13f':
logd: logcat: debuggerd: auditd logs to events
2014-05-16 20:36:33 +00:00
Mark Salyzyn
bc741ac212
Merge "logd: logcat: debuggerd: auditd logs to events"
2014-05-16 20:34:18 +00:00
Ying Wang
cf86e2f85d
Fix host 64-bit build.
...
Bug: 13751317
Change-Id: Ib42d24408d053bacc24142ed18fc5f3181d2345b
2014-05-16 09:36:17 -07:00
Mark Salyzyn
13ee94c510
am 8b2d46a5
: Merge "init: logd: Allow Developer settings to adjust logd size"
...
* commit '8b2d46a5fcbe81edde4b7c405916282a142a09d2':
init: logd: Allow Developer settings to adjust logd size
2014-05-16 00:30:23 +00:00