Elliott Hughes
7a6037e914
am f167968b
: am e0f91c37
: Merge "We HAVE_LITTLE_ENDIAN."
...
* commit 'f167968b4667df017958a653f74c60831faf5ad8':
We HAVE_LITTLE_ENDIAN.
2014-11-22 08:04:43 +00:00
Elliott Hughes
f167968b46
am e0f91c37
: Merge "We HAVE_LITTLE_ENDIAN."
...
* commit 'e0f91c3731b16b010eb31117e941e5468bdfeb2e':
We HAVE_LITTLE_ENDIAN.
2014-11-22 08:01:17 +00:00
Elliott Hughes
a5d7459936
We HAVE_LITTLE_ENDIAN.
...
Change-Id: I68551ad663f2649a06b1958e9bef152e6d026e72
2014-11-21 23:35:36 -08:00
Dan Albert
325c4c9aa7
resolved conflicts for merge of c1ced8bb
to master
...
Change-Id: I83db00ff986ace8a1c77648738b93124613ddfc0
2014-11-20 15:16:22 -08:00
Dan Albert
c1ced8bbcd
am c894c204
: Merge "C++11 compatibility."
...
* commit 'c894c2045f589571c80af0648e7a9dcd7e97b6a8':
C++11 compatibility.
2014-11-20 23:00:48 +00:00
Dan Albert
3bdc5b8268
C++11 compatibility.
...
* Explicit conversion for atomic_uintptr_t initialization.
* Fix string literal concatenation to not be a UD literal.
* Use __typeof__ instead of typeof (should become decltype once this
actually moves to C++11).
Bug: 18466763
Change-Id: I4eedddfb945a2a703ed27317cb6e2b3041b1ebfc
2014-11-20 21:04:35 +00:00
Marco Nelissen
e12cfc23b2
am 55f71bc0
: Merge "Replace IInterface::asBinder() with a static"
...
* commit '55f71bc0800b9ec7a779c5d30d5a90e074c2526b':
Replace IInterface::asBinder() with a static
2014-11-17 18:52:56 +00:00
Marco Nelissen
097ca275f4
Replace IInterface::asBinder() with a static
...
so we can do NULL checks again, and update calls to IInterface::asBinder()
to use the new static version.
Change-Id: Ia7b10eb38ca55b72278bfd33d3bf647f338b4e6a
2014-11-17 08:47:01 -08:00
Marco Nelissen
2ea926bda2
Replace IInterface::asBinder() with a static
...
so we can do NULL checks again, and update calls to IInterface::asBinder()
to use the new static version.
Change-Id: Ia7b10eb38ca55b72278bfd33d3bf647f338b4e6a
2014-11-14 14:01:29 -08:00
Dianne Hackborn
abd62d66ef
am 1f3ac8b4
: am a4cff88d
: Fix issue #18356768 : some app process may hang at Runtime#exit...
...
* commit '1f3ac8b42ff784930d8194b75d33aef1098a8231':
Fix issue #18356768 : some app process may hang at Runtime#exit...
2014-11-14 19:18:26 +00:00
Dianne Hackborn
1f3ac8b42f
am a4cff88d
: Fix issue #18356768 : some app process may hang at Runtime#exit...
...
* commit 'a4cff88d80bf1acbdbd063af88ecad83a8b9b7b4':
Fix issue #18356768 : some app process may hang at Runtime#exit...
2014-11-14 01:43:31 +00:00
Dianne Hackborn
a4cff88d80
Fix issue #18356768 : some app process may hang at Runtime#exit...
...
...in Parcel destructor
Don't use a Mutux object, just use simple posix mutex primitives,
to avoid static init/destroy order problems.
Change-Id: Ic012d94297564c0a55d58869f8276d7d10545fbc
2014-11-13 17:09:59 -08:00
Dan Stoza
d26b17a137
Merge "Enable clang for libui/libgui/surfaceflinger"
2014-11-12 20:14:29 +00:00
Dianne Hackborn
00326f6409
am ba2e1a33
: am ca69e8f2
: Merge "Add tracking of parcel memory allocations." into lmp-mr1-dev
...
* commit 'ba2e1a332eb24fcf4eef3634b8233d1681fd1309':
Add tracking of parcel memory allocations.
2014-11-12 16:36:49 +00:00
Dianne Hackborn
ba2e1a332e
am ca69e8f2
: Merge "Add tracking of parcel memory allocations." into lmp-mr1-dev
...
* commit 'ca69e8f2d0a1fc963bd170f9b2bf164028761323':
Add tracking of parcel memory allocations.
2014-11-12 03:51:05 +00:00
Dianne Hackborn
7e790af756
Add tracking of parcel memory allocations.
...
Change-Id: I76ffed0e69ccfe70e87d98646f11d4de7c3fd980
2014-11-11 16:23:04 -08:00
Dan Stoza
f10c46ef85
Enable clang for libui/libgui/surfaceflinger
...
Enables clang and C++11 for libui/libgui/surfaceflinger, and
eliminates all compile-time warnings.
Change-Id: Ie237fdb5ae44f2bfcddaa884f9c65ec3f08ae50f
2014-11-11 14:28:22 -08:00
Dan Stoza
6b7a45859e
am 8e624d4c
: am 98d20f82
: Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev
...
* commit '8e624d4cad45532c09879356f3adaa3b65fdcfc9':
Add a BufferItem parameter to onFrameAvailable
2014-11-07 20:09:39 +00:00
Dan Stoza
8e624d4cad
am 98d20f82
: Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev
...
* commit '98d20f82ca8979b30c81df9639f54ab11e1951f9':
Add a BufferItem parameter to onFrameAvailable
2014-11-07 20:03:42 +00:00
Dan Stoza
98d20f82ca
Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev
2014-11-07 19:44:31 +00:00
Dan Stoza
8dc55396fc
Add a BufferItem parameter to onFrameAvailable
...
Passes the BufferItem for the queued buffer to the onFrameAvailable
callback so the consumer can track the BufferQueue's contents. Also
adds an onFrameReplaced callback, which is necessary if the consumer
wants to do anything more than simple queue length tracking.
Bug: 18111837
Change-Id: If9d07229c9b586c668e5f99074e9b63b0468feb0
2014-11-07 10:39:13 -08:00
Dan Albert
cad831fb15
am c6f93a43
: Merge "Add missing include to fix libc++ build."
...
* commit 'c6f93a43d636b0ad16b75adf664c6a33d30b39dd':
Add missing include to fix libc++ build.
2014-11-07 18:37:43 +00:00
Dan Albert
0d1c700214
Add missing include to fix libc++ build.
...
This was previously committed, but I guess it got lost in the merge
queue.
Bug: 15193147
Change-Id: Ic0e5d90ab403fb833d6a3bb7c55d279c56534869
2014-11-07 09:33:44 -08:00
Michael Lentine
585cccc7ff
am a2f27a0d
: am 26645298
: Merge "Fix for corruption when numFds or numInts is too large." into lmp-mr1-dev
...
* commit 'a2f27a0d63da87b23bf214355882bbcea6a163ea':
Fix for corruption when numFds or numInts is too large.
2014-11-05 20:11:32 +00:00
Michael Lentine
a2f27a0d63
am 26645298
: Merge "Fix for corruption when numFds or numInts is too large." into lmp-mr1-dev
...
* commit '26645298400c0ae3a95731388364263d6a914ee4':
Fix for corruption when numFds or numInts is too large.
2014-11-05 19:06:19 +00:00
Michael Lentine
2664529840
Merge "Fix for corruption when numFds or numInts is too large." into lmp-mr1-dev
2014-11-05 18:58:22 +00:00
Dan Albert
c954a121e1
Add a missing include.
...
Was being included transitively by stlport.
Bug: 15193147
Change-Id: If462e5ddcf4a620367fb4b5533f44960fd3b7378
2014-11-04 22:31:05 -08:00
Jesse Hall
6eb6b9fd8c
am 06ce1094
: am fee99040
: Revert "Add more logging for dup(fd) failure"
...
* commit '06ce1094706bb0856f6cc876e1f5276adc642446':
Revert "Add more logging for dup(fd) failure"
2014-11-04 17:40:28 +00:00
Jesse Hall
eab3e59f8b
am 88361aaa
: am 8e5cf83a
: Revert "Parcel: extra validation/debug code for writeDupFileDescriptor"
...
* commit '88361aaaf4f2339f50dc32438a261283c642d471':
Revert "Parcel: extra validation/debug code for writeDupFileDescriptor"
2014-11-04 17:40:27 +00:00
Jesse Hall
06ce109470
am fee99040
: Revert "Add more logging for dup(fd) failure"
...
* commit 'fee99040de000a64f6036a7db172fb7c68d9764a':
Revert "Add more logging for dup(fd) failure"
2014-11-04 17:35:23 +00:00
Jesse Hall
88361aaaf4
am 8e5cf83a
: Revert "Parcel: extra validation/debug code for writeDupFileDescriptor"
...
* commit '8e5cf83afbe2b671f96d04786cf0d0f967e342f9':
Revert "Parcel: extra validation/debug code for writeDupFileDescriptor"
2014-11-04 17:35:23 +00:00
Jesse Hall
aa4ccfd123
am de288fe2
: Revert "bufferqueue: workaround: allow NULL fence with queueBuffer"
...
* commit 'de288fe2d43adfa1b2243ae534faaf832bf50491':
Revert "bufferqueue: workaround: allow NULL fence with queueBuffer"
2014-11-04 17:35:22 +00:00
Jesse Hall
fee99040de
Revert "Add more logging for dup(fd) failure"
...
Underlying bug has been fixed, extra debug code no longer needed
This reverts commit 36273c991b
.
Change-Id: Ia47f1ae9ee7338329bfb8d710aff57e15e944f20
2014-11-04 08:48:16 -08:00
Jesse Hall
8e5cf83afb
Revert "Parcel: extra validation/debug code for writeDupFileDescriptor"
...
Underlying bug has been fixed, extra debug code no longer needed.
This reverts commit ccf851f108
.
Change-Id: I19ad9239efdf1d8f70cd74af9b7c2ae97713208f
2014-11-04 08:47:57 -08:00
Jesse Hall
de288fe2d4
Revert "bufferqueue: workaround: allow NULL fence with queueBuffer"
...
Underlying bug has been fixed, workaround no longer needed
This reverts commit 5b0cbcf946
.
Change-Id: Ic9532b407d1291a7780a12a75aaa117ae4aa9fcb
2014-11-04 08:47:37 -08:00
Chih-Hung Hsieh
4c1482acb1
am 923b0f6a
: am ac5cd96f
: am dbab409c
: Merge "Avoid two warnings from clang."
...
* commit '923b0f6a6787462509c23349ac04b8e9360c51cc':
Avoid two warnings from clang.
2014-11-04 02:09:30 +00:00
Chih-Hung Hsieh
923b0f6a67
am ac5cd96f
: am dbab409c
: Merge "Avoid two warnings from clang."
...
* commit 'ac5cd96fe24690d9e0ae823c77334b8579139aa2':
Avoid two warnings from clang.
2014-11-04 01:58:17 +00:00
Chih-Hung Hsieh
ac5cd96fe2
am dbab409c
: Merge "Avoid two warnings from clang."
...
* commit 'dbab409c49ca5dd6686912d0b3eeb19ef1c37a3e':
Avoid two warnings from clang.
2014-11-04 01:24:07 +00:00
Michael Lentine
dfd06b89a4
Fix for corruption when numFds or numInts is too large.
...
Bug: 18076253
Change-Id: I4c5935440013fc755e1d123049290383f4659fb6
2014-11-03 14:08:54 -08:00
Michael Lentine
001ed44536
am 54430ca2
: am 793fc0e1
: Merge "Fix crash when user provides large values in the Parcel." into lmp-mr1-dev
...
* commit '54430ca2a88f57c709ea2924ea0b78820ae62643':
Fix crash when user provides large values in the Parcel.
2014-11-01 00:41:16 +00:00
Michael Lentine
54430ca2a8
am 793fc0e1
: Merge "Fix crash when user provides large values in the Parcel." into lmp-mr1-dev
...
* commit '793fc0e13d25bdecda1219999f8be2cb3c121d20':
Fix crash when user provides large values in the Parcel.
2014-11-01 00:33:29 +00:00
Michael Lentine
8afa1c4ab8
Fix crash when user provides large values in the Parcel.
...
Bug: 18102648
Change-Id: Ie6a24718e586a34424238363de80f9545951514f
2014-10-31 16:08:44 -07:00
Michael Lentine
fb66335bcc
am 078794ed
: am 98536859
: Merge "Fix output of pointers for 64bit devices." into lmp-mr1-dev
...
* commit '078794ed377e7080ee155a632482bb98f1c9ade7':
Fix output of pointers for 64bit devices.
2014-10-31 23:07:01 +00:00
Michael Lentine
078794ed37
am 98536859
: Merge "Fix output of pointers for 64bit devices." into lmp-mr1-dev
...
* commit '9853685931298ba02066ebb50a8377ad4aa80f00':
Fix output of pointers for 64bit devices.
2014-10-31 22:58:19 +00:00
Chih-Hung Hsieh
8e5337de2c
Avoid two warnings from clang.
...
Clang compiler warns about undefined static functions like getReturnString
before all references are removed inside IF_LOG_COMMANDS.
To remove such warnings, we can leave those static functions defined
and the compiler will remove them at the end when they are not used.
Add a cast to long before converting from int to void*,
to avoid type cast warnings on 64 bit targets.
BUG: 17043248
Change-Id: Ica31101522279d2c8eacc90e2939767002fb827b
2014-10-31 18:38:00 +00:00
Michael Lentine
fae12d4fb4
Fix output of pointers for 64bit devices.
...
Change-Id: I279c1cf8d4c126b98f4a92ca807ade3749d01ff0
2014-10-31 11:08:19 -07:00
Jesse Hall
f12f15502a
am 1834f8ea
: GLConsumer: correct EGL_NO_DISPLAY to EGL_NO_CONTEXT
...
* commit '1834f8ea975e9a882b44dc479320fe02e306e630':
GLConsumer: correct EGL_NO_DISPLAY to EGL_NO_CONTEXT
2014-10-30 20:58:43 +00:00
Jesse Hall
1834f8ea97
GLConsumer: correct EGL_NO_DISPLAY to EGL_NO_CONTEXT
...
Change-Id: I4dcb57a0db9ee3c5222cd453c9213859384212b0
(cherry picked from commit 46a1f6b40e
)
2014-10-29 17:15:09 +00:00
Michael Lentine
2bb7270783
am 15b2ecf5
: am dcc959be
: Merge "Adding eglInitialize and eglTerminate image creation and deletion." into lmp-mr1-dev
...
* commit '15b2ecf599414c86cb198f3ffc126b50f88b5aa0':
Adding eglInitialize and eglTerminate image creation and deletion.
2014-10-21 18:43:47 +00:00
Michael Lentine
15b2ecf599
am dcc959be
: Merge "Adding eglInitialize and eglTerminate image creation and deletion." into lmp-mr1-dev
...
* commit 'dcc959beb77099d319a94e3985da2f4ea4064e7b':
Adding eglInitialize and eglTerminate image creation and deletion.
2014-10-21 18:35:24 +00:00