Treehugger Robot
36b88ce975
Merge "Move libusbhost's headers into libusbhost."
2016-09-17 01:33:11 +00:00
Colin Cross
3b7524fe3a
Merge "Fix warnings in cutils/atomic.h" am: 5e093f367c am: 6f292bcab9
...
am: a205ed0aad
2016-09-16 20:08:56 +00:00
Colin Cross
a205ed0aad
Merge "Fix warnings in cutils/atomic.h" am: 5e093f367c
...
am: 6f292bcab9
2016-09-16 19:47:31 +00:00
Treehugger Robot
5e093f367c
Merge "Fix warnings in cutils/atomic.h"
2016-09-16 19:31:10 +00:00
Colin Cross
412ad0dad8
Hide gnu extension warnings in log/log.h
...
system/core/include is included in the global include path using
-isystem, which hides all warnings. Fix warnings in log/log.h
in preparation for moving from -isystem to -I.
log/log.h uses gnu extensions for zero-argument variadic macro token
pasting, which clang warns about with -Weverything. Hide the warnings
using pragmas.
Test: m -j native
Bug: 31492149
Change-Id: Ib2113f877d811a6ecc0e91c035640b506f04bd86
2016-09-16 11:13:20 -07:00
Elliott Hughes
ab273a5a4b
Move libbinderwrapper's headers into libbinderwrapper. am: 40104501fa am: c5cc029993
...
am: 761c529b37
2016-09-16 18:04:57 +00:00
Elliott Hughes
761c529b37
Move libbinderwrapper's headers into libbinderwrapper. am: 40104501fa
...
am: c5cc029993
2016-09-16 17:51:24 +00:00
Elliott Hughes
e0a7c773ed
Move libusbhost's headers into libusbhost.
...
Change-Id: Ic5ff65bd6456ea3cc92e0c8f9d7a6f499e58dbfc
2016-09-16 10:43:56 -07:00
Elliott Hughes
40104501fa
Move libbinderwrapper's headers into libbinderwrapper.
...
It was probably the LOCAL_EXPORT_C_INCLUDE_DIRS that made me miss this on the
original code review...
Change-Id: I55bc0b0698604338cd206bf5f336798929b6d8f9
2016-09-16 09:02:47 -07:00
Colin Cross
ec69c05463
Fix warnings in cutils/atomic.h
...
system/core/include is included in the global include path using
-isystem, which hides all warnings. Fix warnings in cutils/atomic.h in
preparation for moving from -isystem to -I.
Test: m -j native
Bug: 31492149
Change-Id: I2a212f192309090a16d507e9ab6acf0fd7cac02d
2016-09-15 19:22:32 -07:00
Courtney Goeltzenleuchter
7ae63a8cbd
Add color mode enums am: a2e874eabc
...
am: ae93122c0e
2016-09-09 18:47:13 +00:00
Lajos Molnar
ef8322329e
add android_flex_layout for describing all flexible formats. am: 0e10df4dd6
...
am: a2d46813fc
2016-09-09 18:47:07 +00:00
Courtney Goeltzenleuchter
a2e874eabc
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-09-08 11:39:32 -07:00
Lajos Molnar
0e10df4dd6
add android_flex_layout for describing all flexible formats.
...
Bug: 22767098
Bug: 24759202
Change-Id: I61e4ca9bd71e8da88a9571ec4effc7165026715b
2016-09-08 11:38:53 -07:00
Felipe Leme
c561b35f29
Added a NETWORK trace tag. am: 785735bde1
...
am: 860f100454
2016-09-08 00:44:48 +00:00
Felipe Leme
785735bde1
Added a NETWORK trace tag.
...
BUG: 31281543
Change-Id: I4d7c7fc26c77fec099bbf0f9426e3a9f3a722e6d
2016-09-07 12:47:18 -07:00
Mark Salyzyn
2fb3f08d51
liblog: add __android_log_close()
...
Bug: 30963384
(cherry picked from commit df7a4c6bae
2016-08-30 16:02:08 +01:00
Christopher Ferris
0c572d01af
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
Bug: 31067025
(cherry picked from commit 3a14004c7f
2016-08-25 15:01:53 -07:00
Martijn Coenen
111ef54a28
Merge changes from topic 'utf' am: 3a07e5bf94 am: aa7fd8a3ec
...
am: ade3876260
2016-08-25 20:31:42 +00:00
Martijn Coenen
ade3876260
Merge changes from topic 'utf' am: 3a07e5bf94
...
am: aa7fd8a3ec
2016-08-25 20:24:14 +00:00
Sergio Giro
1cfa56d46c
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-08-25 20:07:51 +00:00
Sergio Giro
9de6776321
Unicode: specify destination length in utf8_to_utf16 methods
...
String16(const char *utf8) now returns the empty string in case
a string ends halfway throw a utf8 character.
Bug: 29267949
Clean cherry-pick from 1dcc0c8239
2016-08-25 19:57:06 +00:00
Hans Boehm
2d3545fe82
Merge "Make RefBase more robust and debuggable" am: daac359be7 am: 7bf3d21fde
...
am: 7dddf9433c
2016-08-24 23:52:14 +00:00
Hans Boehm
7dddf9433c
Merge "Make RefBase more robust and debuggable" am: daac359be7
...
am: 7bf3d21fde
2016-08-24 23:49:14 +00:00
Hans Boehm
daac359be7
Merge "Make RefBase more robust and debuggable"
2016-08-24 23:36:13 +00:00
Andy Hung
8ec6753d61
Fix Mutex::timedLock to properly handle relative time am: 604ba48220 am: 708b9d118a
...
am: 47e5ca61e2
2016-08-24 22:50:00 +00:00
Andy Hung
604ba48220
Fix Mutex::timedLock to properly handle relative time
...
Bug: 31008450
Change-Id: Ie6c17e17b7a8c3d8a087c47be535e9d04f285380
2016-08-24 22:29:11 +00:00
Mark Salyzyn
e5bda4d0ec
Merge "liblog: add __android_log_close()" am: 812d1c7ea2 am: 6322efe522
...
am: ed421af68d
2016-08-24 16:10:09 +00:00
Mark Salyzyn
af3623281f
Merge "logger: validate hdr_size field in logger entry" am: fcf7ab8b1b am: 2d562c9dce
...
am: 098b5887c6
2016-08-24 16:10:08 +00:00
Mark Salyzyn
ed421af68d
Merge "liblog: add __android_log_close()" am: 812d1c7ea2
...
am: 6322efe522
2016-08-24 16:07:39 +00:00
Mark Salyzyn
098b5887c6
Merge "logger: validate hdr_size field in logger entry" am: fcf7ab8b1b
...
am: 2d562c9dce
2016-08-24 16:07:38 +00:00
Mark Salyzyn
6322efe522
Merge "liblog: add __android_log_close()"
...
am: 812d1c7ea2
2016-08-24 16:05:05 +00:00
Mark Salyzyn
2d562c9dce
Merge "logger: validate hdr_size field in logger entry"
...
am: fcf7ab8b1b
2016-08-24 16:05:04 +00:00
Treehugger Robot
812d1c7ea2
Merge "liblog: add __android_log_close()"
2016-08-24 15:58:48 +00:00
Treehugger Robot
fcf7ab8b1b
Merge "logger: validate hdr_size field in logger entry"
2016-08-24 15:56:23 +00:00
Mark Salyzyn
8e5cb037c4
Merge "libcutils: Add ashmem_valid() function" am: d00c7470ea am: 8b1f7b595c
...
am: da07f7880c
2016-08-24 15:54:08 +00:00
Mark Salyzyn
da07f7880c
Merge "libcutils: Add ashmem_valid() function" am: d00c7470ea
...
am: 8b1f7b595c
2016-08-24 15:51:08 +00:00
Mark Salyzyn
8b1f7b595c
Merge "libcutils: Add ashmem_valid() function"
...
am: d00c7470ea
2016-08-24 15:48:55 +00:00
Mark Salyzyn
ee431112ff
libcutils: Add ashmem_valid() function
...
Bug: 30310689
Change-Id: I14c52c5d52745a725799652b87c86281ac214899
2016-08-23 15:29:28 -07:00
Mark Salyzyn
df7a4c6bae
liblog: add __android_log_close()
...
Bug: 30963384
Change-Id: I901e6ac2cc3c601bbecc2d64e00a98e2ab448210
2016-08-23 15:25:03 -07:00
Mark Salyzyn
305374cf0f
logger: validate hdr_size field in logger entry
...
- check hdr_size to make sure it is in the expected range
from sizeof entry_v1 to entry (entry_v4).
- alter msg() method to report NULL on invalid hdr_size
- alter all users of msg() method.
Bug: 30947841
Change-Id: I9bc1740d7aa9f37df5be966c18de1fb9de63d5dd
2016-08-23 14:51:50 -07:00
Connor O'Brien
7d7f5399d4
Fix vold vulnerability in FrameworkListener am: 470484d2a2 am: e9e046df6c am: 109024f74a am: b906ad88b9 am: 2fadbb93a4 am: e04054d9bb am: 9745b11db1 am: 2f78b2c3d6 am: 2b5e6d8ffc am: 2427a462c0 am: 6b155c1cc4 am: 2f16eeede6
...
am: 233c9902cf
2016-08-19 22:57:38 +00:00
Connor O'Brien
233c9902cf
Fix vold vulnerability in FrameworkListener am: 470484d2a2 am: e9e046df6c am: 109024f74a am: b906ad88b9 am: 2fadbb93a4 am: e04054d9bb am: 9745b11db1 am: 2f78b2c3d6 am: 2b5e6d8ffc am: 2427a462c0 am: 6b155c1cc4
...
am: 2f16eeede6
2016-08-19 22:53:32 +00:00
Connor O'Brien
af8d67e032
Fix vold vulnerability in FrameworkListener am: 470484d2a2 am: e9e046df6c am: 109024f74a am: b906ad88b9 am: 2fadbb93a4 am: e04054d9bb am: 9745b11db1 am: 2f78b2c3d6 am: 2b5e6d8ffc am: 2427a462c0 am: 6b155c1cc4
...
am: 2f16eeede6
2016-08-19 22:53:32 +00:00
Connor O'Brien
2f16eeede6
Fix vold vulnerability in FrameworkListener am: 470484d2a2 am: e9e046df6c am: 109024f74a am: b906ad88b9 am: 2fadbb93a4 am: e04054d9bb am: 9745b11db1 am: 2f78b2c3d6 am: 2b5e6d8ffc am: 2427a462c0
...
am: 6b155c1cc4
2016-08-19 22:50:00 +00:00
Connor O'Brien
2f78b2c3d6
Fix vold vulnerability in FrameworkListener am: 470484d2a2 am: e9e046df6c am: 109024f74a am: b906ad88b9 am: 2fadbb93a4 am: e04054d9bb
...
am: 9745b11db1
2016-08-19 22:36:29 +00:00
Connor O'Brien
9745b11db1
Fix vold vulnerability in FrameworkListener am: 470484d2a2 am: e9e046df6c am: 109024f74a am: b906ad88b9 am: 2fadbb93a4
...
am: e04054d9bb
2016-08-19 22:34:46 +00:00
Connor O'Brien
2fadbb93a4
Fix vold vulnerability in FrameworkListener am: 470484d2a2 am: e9e046df6c am: 109024f74a
...
am: b906ad88b9
2016-08-19 22:14:57 +00:00
Connor O'Brien
b906ad88b9
Fix vold vulnerability in FrameworkListener am: 470484d2a2 am: e9e046df6c
...
am: 109024f74a
2016-08-19 22:11:27 +00:00
Connor O'Brien
109024f74a
Fix vold vulnerability in FrameworkListener am: 470484d2a2
...
am: e9e046df6c
2016-08-19 22:08:22 +00:00
