ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
51,815 Commits 2 Branches 0 Tags 54 MiB
ffe3e96afe
Commit Graph

2816 Commits

Author SHA1 Message Date
Eino-Ville Talvala
82c6bcc970 DO NOT MERGE Add dataSpace to buffer queues; remove old format enums. 
- Wire up new dataSpace parameter through buffer queue stack
- Update tests to include the parameter
- Switch eglApi to using dataSpace to indicate sRGB gamma/linear
  difference
- Remove RAW_SENSOR in favor of RAW16
- Remove use of sRGB format enums
- Add default dataspace to buffer queue core
- Add query for default dataspace

Cherry pick of I070bd2e7c56506055c419004c29e2e3feac725df

Change-Id: I461952389c18051176c6b75e664f20ad369f5760
 2015-03-19 13:56:00 -07:00
Dan Stoza
ad36432de8 Merge "Surface: Permit an IProducerListener on connect" 2015-03-19 17:45:26 +00:00
Dan Stoza
744fc02fe8 libgui: Only allow one return from useFenceSync 
An #ifdef was causing multiple returns in this function, which was
triggering an unreachable code error on some build targets. This
adds an #else to ensure that only one return is exposed in any given
build.

Cherry pick of I9ed7c3e769bc9094ad31d810944227d1d8302886

Change-Id: Ibddc5706159d168031d1805fcce3eedc068296cf
 2015-03-19 10:32:51 -07:00
Dan Stoza
966b98bd86 Surface: Permit an IProducerListener on connect 
This change allows clients of Surface to provide an IProducerListener
callback object to Surface::connect, which will be passed down to the
underlying IGraphicBufferProducer.

Cherry pick of I5ea5229bf3a329bf02c6bd20e7247039c75d136b

Change-Id: I6f8f52c72654e4cee649721383819bafe378f964
 2015-03-18 16:01:20 -07:00
Dan Stoza
2632350ac8 GLConsumer: Fix unsigned subtraction during crop 
Since some variables had been switched from signed to unsigned, there
was a section of code that was guaranteed to be incorrect because it
effectively did 'if (a < b) { c = a - b; }'. This change fixes it.

Cherry pick of I9cdd6c9a0179801addebb5d6dc1fbaddf8f53c62

Bug: 19346631
Change-Id: Id13a46f74c9ae7278463ce22b586f4dc21b5e453
 2015-03-18 16:00:44 -07:00
Michael Lentine
c168b8a5a9 Update maxNumber to be smaller. 
There shouldn't be more than 4096 fds (probably signficantly smaller) and
there shouldn't be more than 4096 ints.

Cherry pick of I3a3e50ee3078a4710e9737114e65afc923ed0573

Bug: 18076253
Change-Id: I82a883572b401f115d252dcd3d00aa7252b49b0e
 2015-03-18 16:00:05 -07:00
Dan Stoza
3be1c6b60a libgui: Enable -Weverything and -Werror 
Enables -Weverything and -Werror, with just a few exceptions for
warnings we can't (or shouldn't need to) work around.

Cherry pick of I034abec27bf4020d84af60d7acc1939c59986dd6 plus a
couple of minor changes to CpuConsumer.cpp to make it work with a
prior change:
    Uncomment CC_LOGV on line 46
    Change C-style cast to static_cast on line 71

Change-Id: Iaec610477ea0122317b0578fb74caf2383d4cf08
 2015-03-18 15:57:27 -07:00
Elliott Hughes
485d373004 am f3f22e55: Merge "Add missing <unistd.h> include for close." 
* commit 'f3f22e555bae8e362f3cac1efb289ca321266035':
  Add missing <unistd.h> include for close.
 2015-02-20 01:13:29 +00:00
Elliott Hughes
14df3564fb Add missing <unistd.h> include for close. 
Change-Id: Iebce6d74eecb8c275e800b7f47f74bbd4374860d
 2015-02-19 16:58:44 -08:00
Nick Vaccaro
26cc3d0b67 am b9bb1f13: Merge "Add support for SENSOR_TYPE_WRIST_TILT_GESTURE" into lmp-mr1-modular-dev 
* commit 'b9bb1f139bd1cbf3b3faa002b509f3f0a167e20b':
  Add support for SENSOR_TYPE_WRIST_TILT_GESTURE
 2015-02-11 20:04:42 +00:00
Nick Vaccaro
9bb99b1570 Add support for SENSOR_TYPE_WRIST_TILT_GESTURE 
Change-Id: I7e5516de805618df41de0f9b06805002e32708c3
 2015-02-07 00:09:05 +00:00
Lajos Molnar
ec41d55b8d am 94ee9b59: Merge "CpuConsumer: lock buffers that could be YUV as ycbcr" into lmp-mr1-dev 
* commit '94ee9b5916903e6ee23bb1ce8f688900a4eb6f65':
  CpuConsumer: lock buffers that could be YUV as ycbcr
 2015-01-29 08:41:35 +00:00
Lajos Molnar
94ee9b5916 Merge "CpuConsumer: lock buffers that could be YUV as ycbcr" into lmp-mr1-dev 2015-01-29 07:53:58 +00:00
Lajos Molnar
180c2ba763 resolved conflicts for merge of 1f9f71e1 to lmp-mr1-dev-plus-aosp 
Change-Id: I627e58fe738e9a3b9831508853f26f9adc350f90
 2015-01-28 21:27:46 -08:00
Lajos Molnar
6a26be7c2b CpuConsumer: lock buffers that could be YUV as ycbcr 
Bug: 17906609
Change-Id: Ic71af69ec3b19ab1224ed3ad5e0a97c60e81cda6
 2015-01-28 16:52:43 -08:00
Lajos Molnar
1f9f71e183 GraphicBufferMapper: handle devices that do not implement lock_ycbcr 
Bug: 19179927
Change-Id: I09ffca954fed3cd2d3466c8396627dc7dbc0052d
 2015-01-28 16:26:36 -08:00
Yabin Cui
39d890d9ae am 6e32c037: Merge "Kill HAVE_PTHREADS." 
* commit '6e32c0377db89bafa477715b3a02431d651978cf':
  Kill HAVE_PTHREADS.
 2015-01-27 19:56:06 +00:00
Yabin Cui
8fb2d25ff3 Kill HAVE_PTHREADS. 
Bug: 19083585
Change-Id: I355491de945590f43c82bdcb7968b01b4bff6e06
 2015-01-26 22:36:36 -08:00
Dan Stoza
e18155e1c6 am 4ecf6ec9: Merge "Restore Region::set(uint32_t, uint32_t)" 
* commit '4ecf6ec932644b680d5e13791275dd3bc1a1ee6d':
  Restore Region::set(uint32_t, uint32_t)
 2015-01-22 00:13:22 +00:00
Dan Stoza
4ecf6ec932 Merge "Restore Region::set(uint32_t, uint32_t)" 2015-01-21 16:39:22 +00:00
Jeff Sharkey
499127eab8 am 8f3ade0c: Merge "Follow StrictMode refactoring." 
* commit '8f3ade0c9ab52a1e4f13d6ff1922dd98e3ccdbcc':
  Follow StrictMode refactoring.
 2015-01-16 06:07:31 +00:00
Jeff Sharkey
0c1f5cbb8a Follow StrictMode refactoring. 
Bug: 18335678
Change-Id: Iea920cfa26b5ebfd77b4601c9e6e65b21599342a
 2015-01-14 10:58:52 -08:00
Riley Andrews
15411a00e1 am aec92242: Merge "Replace all instances of intptr_t with uintptr_t." 
* commit 'aec922426620804768f00a6c5cb902f278f2967f':
  Replace all instances of intptr_t with uintptr_t.
 2015-01-13 23:26:02 +00:00
Riley Andrews
d66ba5209a am 41a160c4: Merge "Fix signed/unsigned comparison warnings in driver interface test." 
* commit '41a160c4cda1ef2c916028ec2d0801da738b5249':
  Fix signed/unsigned comparison warnings in driver interface test.
 2015-01-13 23:26:01 +00:00
Riley Andrews
29d8cf91be Replace all instances of intptr_t with uintptr_t. 
When compiling 32 bit binaries against a 64 bit binder interface,
implicit promotions of intptr_t types to uint64_t for fields in the
binder ioctl structures can result in invalid pointers because of sign
extension.
 2015-01-13 21:59:44 +00:00
Riley Andrews
50bcb00a91 Fix signed/unsigned comparison warnings in driver interface test. 2015-01-12 18:20:49 -08:00
Bernhard Rosenkraenzer
fe4966d59b Restore Region::set(uint32_t, uint32_t) 
The Region::set(uint32_t,uint32_t) ABI is used by the Nexus 10 graphics
driver blobs.
After commit dd883c0b08, Nexus 10 blobs
need a rebuild unless the old ABI is added back

Change-Id: I138dcc1cc281b8d3cde0021282bf874054ec4eaf
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
 2014-12-22 21:15:08 +01:00
Riley Andrews
68047ffd43 am 53186a4d: Merge "Add binder tests" 
* commit '53186a4d78479ba21213b6e055c7a85faeb318e2':
  Add binder tests
 2014-12-19 03:52:36 +00:00
Riley Andrews
bf247a3d37 am dbd252ea: Merge "Add binder driver interface test" 
* commit 'dbd252eab09d669a7d4b917890d75408193a85d3':
  Add binder driver interface test
 2014-12-19 03:52:35 +00:00
Riley Andrews
06b01adcb8 Add binder tests 
Change-Id: Ib0b38708dd6387fc4d5a4857ca74a217f3edad1a
 2014-12-19 00:39:31 +00:00
Riley Andrews
dc9b148985 Add binder driver interface test 
Test ioctls and some binder commands without using libbinder.

Change-Id: I86dde56ff1380bca17d086021ac5324dc5210354
 2014-12-19 00:38:27 +00:00
Andreas Gampe
b93bca5d08 am a59d7a6a: Merge "GUI: Remove unused variables" 
* commit 'a59d7a6a66a2b8dcb2d00dbd6371fa89ae45ab04':
  GUI: Remove unused variables
 2014-12-09 20:09:18 +00:00
Andreas Gampe
5d11a72bcd am 8fd567b1: Merge "Libui: Remove unused variables" 
* commit '8fd567b127170a3962bc9de637eb7987cee71810':
  Libui: Remove unused variables
 2014-12-09 11:25:32 +00:00
Andreas Gampe
7398a5af38 GUI: Remove unused variables 
For build-system CFLAGS clean-up, remove unused variables.

Bug: 18632512
Change-Id: I79fdcf830683d7278f4bf114cfb76a26da1b88ff
 2014-12-08 20:42:40 -08:00
Dan Stoza
e22262ffd0 Merge "libgui: Enable -Weverything and -Werror" 2014-12-08 18:46:08 +00:00
Andreas Gampe
ff78750c64 Libui: Remove unused variables 
For build-system CFLAGS clean-up, remove unused variables.

Bug: 18632512
Change-Id: Ib78912ae442ddc6410960ab1efb4fb2faa1a9208
 2014-12-05 20:52:16 -08:00
Dan Stoza
dd883c0b08 libgui: Enable -Weverything and -Werror 
Enables -Weverything and -Werror, with just a few exceptions for
warnings we can't (or shouldn't need to) work around.

This is a squashed commit based on an initial change with a couple of
fixes to avoid breaking certain targets. The source commits are:
  d723bd7669
  00d504c06e
  429ba89cd2

Change-Id: I034abec27bf4020d84af60d7acc1939c59986dd6
 2014-12-05 14:59:29 -08:00
Michael Lentine
ae33effd43 Fix crash when user provides large values in the Parcel. 
Bug: 18102648
Change-Id: Ie6a24718e586a34424238363de80f9545951514f
(cherry-picked from commit 8afa1c4ab8)
 2014-12-05 20:31:09 +00:00
Dan Albert
6efc505bd8 am 09b9193d: Merge "Fix -Werror on 64-bit builds" 
* commit '09b9193d10b3849e426c5370a757a0eedc65a7ff':
  Fix -Werror on 64-bit builds
 2014-12-05 18:01:50 +00:00
Dan Albert
bcf7f22102 am 67df03d0: Merge "Disable struct padding warning/error" 
* commit '67df03d054f0cc4bd0e47066642b791198e9b0ad':
  Disable struct padding warning/error
 2014-12-05 18:01:49 +00:00
Dan Albert
bb37153577 am 35df7531: Merge "libui: Enable -Weverything and -Werror" 
* commit '35df753169397d9b647b251446af7093e237d047':
  libui: Enable -Weverything and -Werror
 2014-12-05 18:01:49 +00:00
Dan Albert
7530114619 am 5588d900: Merge "Enable clang for libui/libgui/surfaceflinger" 
* commit '5588d9000cd1ef217185c9001d6b5ecd84db9741':
  Enable clang for libui/libgui/surfaceflinger
 2014-12-05 18:01:48 +00:00
Dan Stoza
133caacf87 Fix -Werror on 64-bit builds 
Add another static_cast to avoid an error on 64-bit builds

Change-Id: I62fb2c67766c4aab70d9d1834f255d06ff82dd8d
(cherry picked from commit 116c7a113c)
 2014-12-04 18:06:48 -08:00
Dan Stoza
42af278173 Disable struct padding warning/error 
Adds -Wno-padded, which was triggering on 64-bit devices

Change-Id: If27bac27881f2081a222b32213901f5087554b07
(cherry picked from commit 4e84bd310c)
 2014-12-04 18:06:48 -08:00
Dan Stoza
d318240042 libui: Enable -Weverything and -Werror 
Enables -Weverything and -Werror, with just a few exceptions for
warnings we can't (or shouldn't need to) work around.

Change-Id: I470a267e9b1c373f2d5c960f005c3b0e02b2db63
(cherry picked from commit 303b9a5123)
 2014-12-04 17:56:27 -08:00
Dan Stoza
01049c8321 Enable clang for libui/libgui/surfaceflinger 
Enables clang and C++11 for libui/libgui/surfaceflinger, and
eliminates all compile-time warnings.

Change-Id: Ie237fdb5ae44f2bfcddaa884f9c65ec3f08ae50f
(cherry picked from commit f10c46ef85)
 2014-12-04 17:56:17 -08:00
Michael Lentine
3880326857 Fix for corruption when numFds or numInts is too large. 
Bug: 18076253
Change-Id: I4c5935440013fc755e1d123049290383f4659fb6
(cherry picked from commit dfd06b89a4)
 2014-12-04 17:49:31 -08:00
Dan Stoza
e4ea03f74d am 80e81505: Merge "binder: Add {read,write}Uint32 methods to Parcel" 
* commit '80e8150549c9d8380dadf942336d41ab3d92bf78':
  binder: Add {read,write}Uint32 methods to Parcel
 2014-12-01 19:27:00 +00:00
Dan Stoza
32ad1d518b am 104e1259: Merge "binder: Return pid_t/uid_t instead of int" 
* commit '104e12594e085bc8dd32eedb96643b774b1508a0':
  binder: Return pid_t/uid_t instead of int
 2014-12-01 19:23:22 +00:00
Dan Stoza
41a0f2f86c binder: Add {read,write}Uint32 methods to Parcel 
Adds readUint32 and writeUint32 methods to the Parcel class. This
saves a lot of static_casting in anything implementing a Binder
interface on the native side.

Change-Id: Iafc73b0633654a3a4c49767f41806b56906c924f
 2014-12-01 11:13:11 -08:00
Dan Stoza
9c634fd2d1 binder: Return pid_t/uid_t instead of int 
Makes IPCThreadState::getCalling{Pid,Uid} return a more
appropriate type.

Change-Id: I97f8a83c1c0722bc1afbf8a6df1a288f8f1f0d2c
 2014-12-01 11:07:14 -08:00
Chih-hung Hsieh
a7c75d1b17 am 2d7ec9d7: Merge "Fix build with clang in C++11 mode" 
* commit '2d7ec9d7b5dfdb93930b94c134fa2dc10fd27313':
  Fix build with clang in C++11 mode
 2014-11-25 22:56:02 +00:00
Bernhard Rosenkränzer
74debb0b8f Fix build with clang in C++11 mode 
Now that we're in C++11 mode by default, clang complains about switch
statements with case values not matching the type -- since some
binder_driver_return_protocol values are > 0x7fffffff, we need to make
the switch statements operate on uint32_t rather than int32_t.

BUG: 18466763
Change-Id: Iedbfd5c7a3d3d9f087d2eab4ff21343ad7a2a448
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
 2014-11-25 14:06:04 -08:00
Andreas Gampe
09efe0ac2a am 2e42a906: Merge "Binder: Remove unused functions & variables" 
* commit '2e42a90653abd0fc8a76909b5f101782d187136e':
  Binder: Remove unused functions & variables
 2014-11-25 18:52:24 +00:00
Andreas Gampe
0b53b5c0b3 Binder: Remove unused functions & variables 
For build-system CFLAGS clean-up, remove unused functions and
variables.

Change-Id: I88abc2bc99e6b91c7aa56470ff9671bf8bf29f8d
 2014-11-24 11:39:11 -08: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
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
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
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
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
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
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
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
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
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
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
Michael Lentine
dcc959beb7 Merge "Adding eglInitialize and eglTerminate image creation and deletion." into lmp-mr1-dev 2014-10-21 18:20:45 +00:00
Jesse Hall
937052fb1c am a069e853: am 649bafb7: Merge "bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)" into lmp-dev 
* commit 'a069e8532ba272ac5b935e332e426a3dacf827fc':
  bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)
 2014-10-20 14:31:38 +00:00
Jesse Hall
a069e8532b am 649bafb7: Merge "bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)" into lmp-dev 
* commit '649bafb7ba2c3204295bc3451ff7af7e28e714ed':
  bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)
 2014-10-20 14:17:18 +00:00
Jesse Hall
f35a5ba664 am 649bafb7: Merge "bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)" into lmp-dev 
* commit '649bafb7ba2c3204295bc3451ff7af7e28e714ed':
  bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)
 2014-10-20 14:13:05 +00:00
Jesse Hall
5b0cbcf946 bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE) 
On one device there is a bug, not yet root-caused, that causes fence
fds to not make it across binder from producer to consumer in the
IGraphicBufferProducer::queueBuffer call. Rather than returning an
error, which the producer typically treats as a fatal error, this
change allows the buffer to be queued with no fence. This avoids an
application crash at the risk of (likely single-frame) visible
corruption.

Bug: 17946343
Change-Id: I9ca89f94098c455e1e90f5f58d5336c936b04a9c
 2014-10-19 04:57:10 +00:00
Dan Albert
3235d8e477 am c52e54c4: Merge "Some more test cleanup." 
* commit 'c52e54c47184704613d446eb15d051ceb43d82b3':
  Some more test cleanup.
 2014-10-17 17:53:10 +00:00
Dan Albert
55833709ab am c52e54c4: Merge "Some more test cleanup." 
* commit 'c52e54c47184704613d446eb15d051ceb43d82b3':
  Some more test cleanup.
 2014-10-17 17:53:05 +00:00
Dan Albert
ed7d193ae9 Some more test cleanup. 
Needed to build successfully when libc++ is the default STL.

Also fix a missing include. Not sure how this was getting by before.
Probably some transitive include.

Change-Id: Ie96b79e96b4e154d786fbf2d5ae5cf5892608837
 2014-10-16 20:46:05 -07:00
Dan Albert
27b780b517 am 9cc84950: Merge "Don\'t check if this == NULL." 
* commit '9cc849500df0bba42d3ed19b90c38ff1dffd2262':
  Don't check if this == NULL.
 2014-10-15 22:52:51 +00:00
Dan Albert
759115cd6d am 9cc84950: Merge "Don\'t check if this == NULL." 
* commit '9cc849500df0bba42d3ed19b90c38ff1dffd2262':
  Don't check if this == NULL.
 2014-10-15 22:52:43 +00:00
Dan Albert
9cc849500d Merge "Don't check if this == NULL." 2014-10-15 22:45:07 +00:00