Robert Sesek
d257784aee
Merge \\\"Add static UID for the webview zygote process.\\\" am: 07f5d8cc0c am: ed1c074303
...
am: 15166f96d9
2016-07-15 21:12:25 +00:00
Robert Sesek
15166f96d9
Merge \\"Add static UID for the webview zygote process.\\" am: 07f5d8cc0c
...
am: ed1c074303
2016-07-15 21:08:54 +00:00
Robert Sesek
ed1c074303
Merge \"Add static UID for the webview zygote process.\"
...
am: 07f5d8cc0c
2016-07-15 21:05:25 +00:00
Treehugger Robot
07f5d8cc0c
Merge "Add static UID for the webview zygote process."
2016-07-15 20:58:50 +00:00
Sergio Giro
71d9f83fa9
Merge \"libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\" into nyc-dev
...
am: 757f4ef340
2016-07-14 18:08:00 +00:00
Sergio Giro
570dbfb8b8
libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8
...
Inconsistent behaviour between utf16_to_utf8 and utf16_to_utf8_length
is causing a heap overflow.
Correcting the length computation and adding bound checks to the
conversion functions.
Test: ran libutils_tests
Bug: 29250543
Change-Id: I6115e3357141ed245c63c6eb25fc0fd0a9a7a2bb
(cherry picked from commit c4966a363e
2016-07-14 13:40:43 +00:00
Greg Kaiser
e3d5dfb514
Merge \\\"RefBase: Silence compiler warnings\\\" am: f76ca2a43b am: 3b43562535
...
am: 0c9b9ec4dc
2016-07-12 00:18:06 +00:00
Greg Kaiser
3b43562535
Merge \"RefBase: Silence compiler warnings\"
...
am: f76ca2a43b
2016-07-12 00:15:19 +00:00
Treehugger Robot
f76ca2a43b
Merge "RefBase: Silence compiler warnings"
2016-07-12 00:10:24 +00:00
Greg Kaiser
d9885e7edb
RefBase: Silence compiler warnings
...
We comment out the names of the parameters we're intentionally
not using.
(cherrypick of 44a0eb4d8cdf4ab881f5d5a1acc1155266a46f6a.)
Change-Id: I0a92d9200ca26cdc4700d2ff9e3ab33c102520d5
2016-07-11 16:11:30 -07:00
Robert Sesek
e782a44575
Add static UID for the webview zygote process.
...
This UID will never own any files.
Bug: 21643067
Change-Id: Ifc887b1033ed4564336c8552012fb6bd0de73c15
2016-07-11 12:39:55 -04:00
Sergio Giro
502602366c
Merge \"libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\" into nyc-mr1-dev
...
am: 7714abac6b
2016-07-11 12:22:43 +00:00
Sergio Giro
7714abac6b
Merge "libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8" into nyc-mr1-dev
2016-07-11 12:11:32 +00:00
Sergio Giro
c4966a363e
libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8
...
Inconsistent behaviour between utf16_to_utf8 and utf16_to_utf8_length
is causing a heap overflow.
Correcting the length computation and adding bound checks to the
conversion functions.
Test: ran libutils_tests
Bug: 29250543
Change-Id: I6115e3357141ed245c63c6eb25fc0fd0a9a7a2bb
2016-07-11 09:46:32 +00:00
Elliott Hughes
6605b0b23a
Merge \\\"Make klog_fd thread-safe and make klog_init a no-op.\\\" am: 588b770063 am: 73d363bbc1
...
am: 7288ac3982
2016-07-08 17:12:48 +00:00
Elliott Hughes
73d363bbc1
Merge \"Make klog_fd thread-safe and make klog_init a no-op.\"
...
am: 588b770063
2016-07-08 17:05:25 +00:00
Elliott Hughes
588b770063
Merge "Make klog_fd thread-safe and make klog_init a no-op."
2016-07-08 17:01:13 +00:00
Erik Kline
5f7ecd953a
Merge \\\"Add UIDs for system DNS and tethering DNS\\\" am: c4dc4f3fc2 am: fcf3ed51dc
...
am: 9f31416013
2016-07-08 08:55:14 +00:00
Erik Kline
3c2e2f4d5e
Add UIDs for system DNS and tethering DNS
...
Bug: 29420831
Bug: 29881876
Change-Id: I7a48f980f0e52a3d322c4c02988d48fc6df643ca
(cherry picked from commit d63cf7d85a
2016-07-08 17:49:40 +09:00
Erik Kline
fcf3ed51dc
Merge \"Add UIDs for system DNS and tethering DNS\"
...
am: c4dc4f3fc2
2016-07-08 08:48:11 +00:00
Treehugger Robot
c4dc4f3fc2
Merge "Add UIDs for system DNS and tethering DNS"
2016-07-08 08:43:55 +00:00
Mark Salyzyn
6a70a53235
Merge \\\"logcat: format verbs and adverbs\\\" am: 82fb012a03 am: b13d0ce160
...
am: b6dbe28746
2016-07-06 20:36:27 +00:00
Mark Salyzyn
b13d0ce160
Merge \"logcat: format verbs and adverbs\"
...
am: 82fb012a03
2016-07-06 20:27:29 +00:00
Mark Salyzyn
9cfd1c6ebc
logcat: format verbs and adverbs
...
Bug: 29916087
Change-Id: I039c95b9dc0aa88f1219121513899934381453ae
2016-07-06 11:16:07 -07:00
Dan Stoza
5d636e830f
NativeWindow: Add LAST_[DE]QUEUE_DURATION queries
...
am: 94ededa387
2016-07-06 16:27:37 +00:00
Erik Kline
d63cf7d85a
Add UIDs for system DNS and tethering DNS
...
Bug: 29420831
Bug: 29881876
Change-Id: I7a48f980f0e52a3d322c4c02988d48fc6df643ca
2016-07-06 11:13:59 +09:00
Dan Stoza
94ededa387
NativeWindow: Add LAST_[DE]QUEUE_DURATION queries
...
Adds two new enums to enable querying the duration of the last
dequeue or queue operations to a Surface/ANativeWindow.
Bug: 29413700
Change-Id: Ifa16755911c4a3c013a7128dd4038d328109c32d
2016-07-01 16:07:00 -07:00
Elliott Hughes
171a829c39
Make klog_fd thread-safe and make klog_init a no-op.
...
I'll come back and remove klog_init when I've removed other calls to it.
Change-Id: Iad7fd26d853b4ddc54e9abd44516b6f138cbbfcb
Test: booted N9, looked at "adb shell dmesg" output.
2016-06-29 16:16:41 -07:00
Courtney Goeltzenleuchter
b7d9991277
Add color mode enums
...
am: bf8132a7c1
2016-06-22 00:18:20 +00:00
Courtney Goeltzenleuchter
bf8132a7c1
Add color mode enums
...
The android_color_mode_t defines the color modes supported
by a display. A display can support multiple different
color modes.
sRGB mode and AdobeRGB are deliberately placed at 7 and 8
so that they match mode ID's used on prior devices.
bug: http://b/27926012
Change-Id: I9ab41b56ec0b495c02539665da5be158ffddf843
2016-06-21 14:47:23 -06:00
David 'Digit' Turner
3a72d0fc79
Merge \\\"[qemu]: Move qemu_pipe.h from include/system/ directory.\\\" am: 44b7339aa2 am: 1c01bae82a
...
am: 6bcf0cf1e7
2016-06-21 08:10:38 +00:00
David 'Digit' Turner
1c01bae82a
Merge \"[qemu]: Move qemu_pipe.h from include/system/ directory.\"
...
am: 44b7339aa2
2016-06-21 08:05:18 +00:00
David Turner
44b7339aa2
Merge "[qemu]: Move qemu_pipe.h from include/system/ directory."
2016-06-21 07:38:02 +00:00
Elliott Hughes
9f240487dd
Merge \\\"Use __ with attribute __noreturn__ to avoid colliding with noreturn.\\\" am: e0dfd2a00e am: a1d9edfbf3
...
am: 95bafa7cdd
2016-06-21 02:12:01 +00:00
Elliott Hughes
a1d9edfbf3
Merge \"Use __ with attribute __noreturn__ to avoid colliding with noreturn.\"
...
am: e0dfd2a00e
2016-06-21 02:02:25 +00:00
Treehugger Robot
e0dfd2a00e
Merge "Use __ with attribute __noreturn__ to avoid colliding with noreturn."
2016-06-21 01:52:04 +00:00
Elliott Hughes
665051ca63
Use __ with attribute __noreturn__ to avoid colliding with noreturn.
...
Change-Id: I5a73ec69b580b2e70b2c68177078fa56b8353c19
2016-06-20 17:21:59 -07:00
Josh Gao
fd94eae2e4
Merge changes from topic \\\'debuggerd_client\\\' am: abf88685e3 am: 88347e1430
...
am: 48915ad5e0
2016-06-20 20:52:41 +00:00
Josh Gao
88347e1430
Merge changes from topic \'debuggerd_client\'
...
am: abf88685e3
2016-06-20 20:47:18 +00:00
Treehugger Robot
abf88685e3
Merge changes from topic 'debuggerd_client'
...
* changes:
adb: use libdebuggerd_client.
debuggerd: add libdebuggerd_client.
2016-06-20 20:22:18 +00:00
Christopher Ferris
7d14cf44f3
Merge \\\"Fix race condition updating local map data.\\\" am: 863d8e11b9 am: e1eb2272d6
...
am: 942c77793f
2016-06-18 00:13:58 +00:00
Christopher Ferris
e1eb2272d6
Merge \"Fix race condition updating local map data.\"
...
am: 863d8e11b9
2016-06-18 00:05:26 +00:00
Josh Gao
9c02dc5916
debuggerd: add libdebuggerd_client.
...
Bug: http://b/24414818
Change-Id: I079c534d2c952b6975bf0428eb86cc7a55525737
2016-06-17 13:11:29 -07:00
David 'Digit' Turner
c7b098ceb5
[qemu]: Move qemu_pipe.h from include/system/ directory.
...
The <hardware/qemu_pipe.h> header isn't related to any loadable
hardware module, this patch thus relocates it to <system/qemu_pipe.h>
which is a much more logical location.
Note the following changes:
- The pipe name must begin with the 'pipe:' prefix to avoid an
un-necessary snprintf() and buffer copy.
- Does not probe for the obsolete /dev/goldfish_pipe device, i.e.
only use /dev/qemu_pipe instead.
- Use QEMU_PIPE_DEBUG() instead of D() as the debugging macro.
+ Update ADB to use the newest <system/qemu_pipe.h>
+ Add qemu_pipe_frame_send() and qemu_pipe_frame_recv() utility
functions which replace the obsolete qemud_channel_send() and
qemud_channel_recv() from the defunct <hardware/qemud.h>
header.
BUG=25875346
Change-Id: Ic290a5b79d466c2af64b49bd9134643277c11bfd
2016-06-17 09:21:59 +02:00
Christopher Ferris
3a14004c7f
Fix race condition updating local map data.
...
If the underlying local map changes, it's possible for multiple
threads to try and modify the map data associated with the UnwindLocalMap
object. Add a lock when generating the local map to avoid this problem.
In addition, add a read lock whenever any caller gets the maps iterator.
Updated all iterator callers to make this lock.
Bug: 29387050
Change-Id: Ie34822c3d8fd3bdb3dd126aeeb399969c36508c1
2016-06-16 23:28:11 -07:00
Lajos Molnar
a571d887a2
Merge \"add android_flex_layout for describing all flexible formats.\" into nyc-mr1-dev
...
am: c873d44942
2016-06-14 20:04:09 +00:00
Dan Stoza
c873d44942
Merge "add android_flex_layout for describing all flexible formats." into nyc-mr1-dev
2016-06-14 19:59:38 +00:00
Pablo Ceballos
9cf6a9ef13
Merge \"Header changes for getFrameTimestamps\" into nyc-mr1-dev
...
am: 0398ec6326
2016-06-09 21:15:42 +00:00
Pablo Ceballos
c2efc32a0f
Header changes for getFrameTimestamps
...
Change-Id: Iee9e0485544fac435e800ea869a8e4c2ed90bba9
2016-06-04 03:36:40 +00:00
Josh Gao
771c1ed582
Merge "cutils: don\'t fortify property_get on clang." am: 310da0b990
...
am: 2a1f209245
2016-06-03 19:46:05 +00:00
