summaryrefslogtreecommitdiffstats
path: root/libs
Commit message (Collapse)AuthorAgeFilesLines
* am c9fcaf37: Merge "Change InputMessage.motion.pointerSize to a uint32_t."Narayan Kamath2014-05-161-8/+8
|\ | | | | | | | | * commit 'c9fcaf3751af078ad730913304431197e4d1ae80': Change InputMessage.motion.pointerSize to a uint32_t.
| * Change InputMessage.motion.pointerSize to a uint32_t.Narayan Kamath2014-05-161-8/+8
| | | | | | | | | | | | | | | | | | | | This ensures it's the same size in both 32 and 64 bit processes and also brings it in line with struct MotionEntry. (cherry-picked from bc6001b026069714177526eb1120b0011d6f2a51) Change-Id: I28e87050478920a54132efbbb8138076ebad1409
* | am bd20e551: Merge "Use asynchronous lock/unlock API"Greg Hackmann2014-05-123-13/+113
|\ \ | |/ | | | | | | * commit 'bd20e551f64234142e1146f9fa4b2dcebbd72122': Use asynchronous lock/unlock API
| * Use asynchronous lock/unlock APIFrancis Hart2014-05-123-13/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | The gralloc API now provides a way for using lock/unlock with the Android explicit synchronisation concept. This changes updates the GraphicBuffer class to also expose this functionality, and updates the Surface class to make use of in line with the dequeueBuffer/queueBuffer mechanism. This new behaviour is dependent on GRALLOC_MODULE_API_VERSION_0_3. If the local gralloc module does not support this then the existing synchronous lock/unlock mechanism will be used. Change-Id: I8c3fd9592e0c5400ac9be84450f55a77cc0bbdc5
* | am a9d49f99: Merge "Revert "Use asynchronous lock/unlock API""Greg Hackmann2014-05-093-113/+13
|\ \ | |/ | | | | | | * commit 'a9d49f99e69d8fc0e60b492b131322c96f47a232': Revert "Use asynchronous lock/unlock API"
| * Merge "Revert "Use asynchronous lock/unlock API""Greg Hackmann2014-05-093-113/+13
| |\
| | * Revert "Use asynchronous lock/unlock API"Greg Hackmann2014-05-093-113/+13
| | | | | | | | | | | | | | | | | | This reverts commit 378ef07760eda717367d9429428c42d54d54d9a7. Change-Id: I1de5ab973b5383633e75924fe90ac3ca8216c36a
* | | am f60564a1: Merge "Use asynchronous lock/unlock API"Greg Hackmann2014-05-093-13/+113
|\ \ \ | |/ / | | | | | | | | | * commit 'f60564a13e917877c76c99294194a621d872076b': Use asynchronous lock/unlock API
| * | Merge "Use asynchronous lock/unlock API"Greg Hackmann2014-05-093-13/+113
| |\ \ | | |/
| | * Use asynchronous lock/unlock APIFrancis Hart2014-05-023-13/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The gralloc API now provides a way for using lock/unlock with the Android explicit synchronisation concept. This changes updates the GraphicBuffer class to also expose this functionality, and updates the Surface class to make use of in line with the dequeueBuffer/queueBuffer mechanism. This new behaviour is dependent on GRALLOC_MODULE_API_VERSION_0_3. If the local gralloc module does not support this then the existing synchronous lock/unlock mechanism will be used. Change-Id: I77daa1beb197b63b1c2f281b8414ac4ae4b5b03c
* | | am 8155ce81: Merge "Remove unused LOCAL_LDLIBS."Ying Wang2014-05-071-2/+0
|\ \ \ | |/ / | | | | | | | | | * commit '8155ce81d4b150e6e453d9443f9fea4cc2c546d2': Remove unused LOCAL_LDLIBS.
| * | Remove unused LOCAL_LDLIBS.Ying Wang2014-05-071-2/+0
| | | | | | | | | | | | Change-Id: I62904c410a66f256da8253764577acae18f964f8
* | | am ef923fcf: Merge "fix GraphicBuffer::flatten crash issue when handle is null"Jesse Hall2014-05-051-2/+4
|\ \ \ | |/ / | | | | | | | | | * commit 'ef923fcfd3db9ca1d7df48273cf9a6258aaf15c2': fix GraphicBuffer::flatten crash issue when handle is null
| * | Merge "fix GraphicBuffer::flatten crash issue when handle is null"Jesse Hall2014-05-051-2/+4
| |\ \
| | * | fix GraphicBuffer::flatten crash issue when handle is nullJun Jiang2014-04-291-2/+4
| | |/ | | | | | | | | | | | | Change-Id: I0d3727e4366cac355791e52cb7790bf8f3c51527 Signed-off-by: Jun Jiang <jun.a.jiang@intel.com>
* | | am 70278fbf: Merge "Add error message for hints when exceptions occur during ↵Jesse Hall2014-05-051-1/+6
|\ \ \ | |/ / | | | | | | | | | | | | | | | binder transactions." * commit '70278fbfe012c1fce3e63a41ffb9feaf1e53a64a': Add error message for hints when exceptions occur during binder transactions.
| * | Add error message for hints when exceptions occur during binder transactions.Jun Jiang2014-04-291-1/+6
| |/ | | | | | | | | | | | | | | It can help to detect some kind of error, such as why GraphicBuffer::flatten will crash when handle is null. Change-Id: I703cd035b96edb7afb324cf24d8230d4e55f4f52 Signed-off-by: Jun Jiang <jun.a.jiang@intel.com>
* | Merge commit '6d05ef2310bdc84811d5b0385b009ad11447a749' into HEADBill Yi2014-04-291-6/+18
|\ \ | |/ |/|
| * am 01502981: Merge "fix valgrind ioctl warning."Jesse Hall2014-03-201-1/+1
| |\ | | | | | | | | | | | | * commit '01502981cddb69b9ab7e4bf8bc66366ae0eb7035': fix valgrind ioctl warning.
| * \ am 5b61ad2c: Check the padded size of the read byte arrayKenny Root2014-03-171-2/+4
| |\ \ | | | | | | | | | | | | | | | | * commit '5b61ad2cda8ec8ab634ce02f388bb2d3c5ab048d': Check the padded size of the read byte array
| | * | Check the padded size of the read byte arrayKenny Root2014-03-171-2/+4
| | | | | | | | | | | | | | | | | | | | Bug: 13509200 Change-Id: Id93894fcc617ec1cd4ce66921c6e1f1c3cf40b09
| * | | am f0190bff: Add support for writing byte arrays to parcelsMarco Nelissen2014-03-141-0/+10
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'f0190bff38b6c29abbfc4a877442f71fc3d7dad8': Add support for writing byte arrays to parcels
| | * | Add support for writing byte arrays to parcelsMarco Nelissen2014-03-131-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | b/13418320 Change-Id: I2285df9e9d3dc8a6a54055b13b352b81660bf45d
| * | | am cdbf28b3: Merge "native frameworks: 64-bit compile issues"Mark Salyzyn2014-03-132-5/+6
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit 'cdbf28b3f7f5327f4cb0eb95b8326bf4c24c87ba': native frameworks: 64-bit compile issues
| * \ \ \ am 462fb3a8: Merge "gui: Fix return code assert in CpuConsumer_test."Igor Murashkin2014-03-111-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '462fb3a8d597fffef3d5534544428d5cee9d8c16': gui: Fix return code assert in CpuConsumer_test.
| * \ \ \ \ am 6b4e5b7f: Merge "Fix misuse of ."Ying Wang2014-03-111-2/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6b4e5b7f856c32b75e9a22df4c3f2273ae906acb': Fix misuse of $(my-dir).
| * \ \ \ \ \ am d1c87d37: Merge changes I3432d9d3,I90fcf538,I64398603Arve Hjønnevåg2014-03-102-1/+11
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd1c87d37025c49f6a47fe43328572da495ff04c1': Binder: Fix some valgrind errors. Binder: Don't cast directly from a pointer to binder_uintptr_t Binder: Disable attemptIncStrongHandle
| * \ \ \ \ \ \ am 74be0f7b: Merge "binder: fix all warnings"Colin Cross2014-03-078-36/+39
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '74be0f7be35e7b40a322fa9a407cb49265333a0b': binder: fix all warnings
| * \ \ \ \ \ \ \ am 4e7fd950: Merge "Use 64 bit binder interface if TARGET_USES_64_BIT_BINDER ↵Arve Hjønnevåg2014-03-071-0/+4
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | _or_ TARGET_IS_64_BIT is set." * commit '4e7fd9506103dcc9750788caf1f94b8d1348f37b': Use 64 bit binder interface if TARGET_USES_64_BIT_BINDER _or_ TARGET_IS_64_BIT is set.
| * \ \ \ \ \ \ \ \ am 58242fc2: Merge changes ↵Arve Hjønnevåg2014-03-075-85/+117
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ib0e5a037,I1bd7c38e,Icfc67c2a,I96c64312,I59528054, ... * commit '58242fc29881cf29d56ee6e5fde6d73b16d0b67c': ServiceManager: Implement PING_TRANSACTION ServiceManager: Use 32/64 bit types from new binder header Binder: Use 64 bit pointers in 32 processes if selected by the target Add BINDER_IPC_32BIT to CFLAGS unless TARGET_USES_64_BIT_BINDER is true Binder: Make binder portable ServiceManager: Fix the binder interface ServiceManager: Store handles in uint32_t instead of void * ServiceManager: Generic Fixes ServiceManager: Add extra error handling ServiceManager: Fix Android.mk ServiceManager: Make use of kernel exported structures
| * \ \ \ \ \ \ \ \ \ am 67903293: Fix "Binder: Make sure binder objects do not overlap" to work ↵Arve Hjønnevåg2014-02-201-4/+4
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | old binder kernel interface * commit '6790329358d1c84af2fe9ba093bcfc1c6176e758': Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface
| | * | | | | | | | | Fix "Binder: Make sure binder objects do not overlap" to work old binder ↵Arve Hjønnevåg2014-02-191-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kernel interface DO NOT MERGE into any branch that uses the new interface Change-Id: Id54308a89327e69a389ac5916c052ad97f57cb28
| * | | | | | | | | | am f50b9eaa: Binder: Make sure binder objects do not overlapArve Hjønnevåg2014-02-191-0/+12
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f50b9eaaeeaeae16981f11b05d3f3a6fb0dea30d': Binder: Make sure binder objects do not overlap
| | * | | | | | | | | Binder: Make sure binder objects do not overlapArve Hjønnevåg2014-02-151-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes crashing part of bug 11355082. The driver still leaks references. Change-Id: Ibc6a63b151c1fc1f7666237f25255ba781e02071
| * | | | | | | | | | am f2f74ca6: Merge "Remove references to obsolete pmem functionality."Elliott Hughes2013-11-211-17/+3
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f2f74ca65f34ae0cae6f0cca40f1c18aa771739d': Remove references to obsolete pmem functionality.
* | | | | | | | | | | | libui: fix passing Fence object over binderColin Cross2014-04-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Fence object was writing a size_t into the binder buffer in flatten, which changes size if the producer and consumer are running in a 32-bit and a 64-bit process. Use a uint32_t instead. Change-Id: Ifed526513800ce27f9d605101cddd922292cca37
* | | | | | | | | | | | Remove global variables from ProcessState.Narayan Kamath2014-04-031-35/+0
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These weren't really being used and they make it very hard to reason about who looks at command line arguments. Processes started via app_process (this includes all zygote forks and the system_server) can get information about command line arguments from the AndroidRuntime class, which is available via a call to AndroidRuntime::getRuntime. bug: 13647418 Change-Id: I6f92680c3619a68c6d4b0995db4cdc9adc788e36
* | | | | | | | | | | Merge "fix valgrind ioctl warning."Jesse Hall2014-03-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | fix valgrind ioctl warning.Jin Wei2013-08-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initialize local variable to avoid syscall ioctl warning. Change-Id: I33a90917856018a8527305bb362948ef03bd734c Origin-Change-Id: I022ebce40b3774a815639a5af34bc7aeb2489936 Signed-off-by: Jin Wei <wei.a.jin@intel.com> Signed-off-by: Jian Luo <jian.luo@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Author-tracking-BZ: 62797
* | | | | | | | | | | native frameworks: 64-bit compile issuesMark Salyzyn2014-03-122-5/+6
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix format (print/scanf) - Suppress unused argument warning messages (bonus) Change-Id: I05c7724d2aba6da1e82a86000e11f3a8fef4e728
* | | | | | | | | | Merge "gui: Fix return code assert in CpuConsumer_test."Igor Murashkin2014-03-041-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | gui: Fix return code assert in CpuConsumer_test.Alistair Strachan2013-12-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CpuConsumer error code was changed recently from INVALID_OPERATION to NOT_ENOUGH_DATA, however the CpuConsumer_test was not updated. This change fixes the return code checked by CpuConsumer_test so the test no longer fails. Change-Id: Ie548ddcb313fa34c130ac63355090cb44ac15ebf
* | | | | | | | | | Fix misuse of $(my-dir).Ying Wang2014-02-281-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8b24f60826abe4b541de646cbc3df66929203301
* | | | | | | | | | Binder: Make sure binder objects do not overlapArve Hjønnevåg2014-02-241-0/+12
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes crashing part of bug 11355082. The driver still leaks references. Change-Id: Ibc6a63b151c1fc1f7666237f25255ba781e02071
* | | | | | | | | Binder: Fix some valgrind errors.Arve Hjønnevåg2014-02-182-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using 64 bit binder pointers, only initializing the 32 bit handle, in a stack allocated struct, will pass uninitialized stack data to the kernel and other processes. Change-Id: I3432d9d36bb251d8ddb0a863661aeb80aabb3d92
* | | | | | | | | Binder: Don't cast directly from a pointer to binder_uintptr_tArve Hjønnevåg2014-02-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using the 64 bit binder interface from a 32 bit process the pointer may get sign extended and cause the kernel to fail to read from it. Change-Id: I90fcf53880e2aa92e230a9723f9b3f7696170e32
* | | | | | | | | Binder: Disable attemptIncStrongHandleArve Hjønnevåg2014-02-141-0/+6
| |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The driver does not support BC_ATTEMPT_ACQUIRE and will return an error. IPCThreadState does not handle driver errors, and will resend the failed command blocking all other commands. Change-Id: I643986037341821b27b62dc82df933844f4842b8
* | | | | | | | binder: fix all warningsColin Cross2014-02-058-36/+39
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix warnings related to casting pointers to ints, using %d or %ld to print size_t/ssize_t, and unused parameters. Change-Id: I7a13ba83d402952989c1f795cd9e880a95b98d9e
* | | | | | | Use 64 bit binder interface if TARGET_USES_64_BIT_BINDER _or_ ↵Arve Hjønnevåg2014-02-031-0/+4
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | TARGET_IS_64_BIT is set. Change-Id: I46a29939fa29ec9421ab6dff3285502f69a31745
* | | | | | Binder: Use 64 bit pointers in 32 processes if selected by the targetArve Hjønnevåg2014-01-312-66/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uses new kernel header where void * has been replaced by binder_uintptr_t Change-Id: Icfc67c2a279269f700343bd9246fd7cb94efe2c1