summaryrefslogtreecommitdiffstats
path: root/libs
Commit message (Collapse)AuthorAgeFilesLines
* Merge "SurfaceFlinger: Add sourceCrop to screenshot"Dan Stoza2014-05-283-13/+17
|\
| * SurfaceFlinger: Add sourceCrop to screenshotDan Stoza2014-05-233-13/+17
| | | | | | | | | | | | | | | | | | Adds a sourceCrop Rect parameter to screenshot commands, which allows clients to capture only a portion of the screen instead of the whole screen. Bug: 15137922 Change-Id: I629447573cd34ffb96334cde7ba02490b9ea06d8
* | Surface maxDelay and isWakeUpSensor flag in Sensor.java.Aravind Akella2014-05-231-3/+29
|/ | | | Change-Id: Idd1e9045190beeca87b086b272e8cbf0bed05bae
* am 47d871b2: am d35e3af0: Set default values for FifoMaxEventCount and ↵Aravind Akella2014-05-131-0/+3
|\ | | | | | | | | | | | | ReservedEventCount. * commit '47d871b2795f714499a34ffe85b67f8577883f7b': Set default values for FifoMaxEventCount and ReservedEventCount.
| * am d35e3af0: Set default values for FifoMaxEventCount and ReservedEventCount.Aravind Akella2014-05-131-0/+3
| |\ | | | | | | | | | | | | * commit 'd35e3af04d4b7e850a3b87b2211d1a3993f9b76f': Set default values for FifoMaxEventCount and ReservedEventCount.
| | * Set default values for FifoMaxEventCount and ReservedEventCount.Aravind Akella2014-05-121-0/+3
| | | | | | | | | | | | Change-Id: I4f610c2912ffe1697d1ffb99c556d1c88578466e
* | | Merge "Add wake gesture in Sensor.cpp"Etienne Le Grand2014-05-121-0/+4
|\ \ \
| * | | Add wake gesture in Sensor.cppEtienne Le Grand2014-05-071-0/+4
| | | | | | | | | | | | | | | | Change-Id: Ifb1744acffc2d57da43112fb9966261e8246d6de
* | | | am 38c9e132: am c1ffd351: am bd20e551: Merge "Use asynchronous lock/unlock API"Greg Hackmann2014-05-123-13/+113
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit '38c9e1327a5b24267c3dab5293bc9d7ada6e9fc9': Use asynchronous lock/unlock API
| * | | am c1ffd351: am bd20e551: Merge "Use asynchronous lock/unlock API"Greg Hackmann2014-05-123-13/+113
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit 'c1ffd351bc44483369271c11dd4c6391bba8c64c': Use asynchronous lock/unlock API
| | * \ \ 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 9493d492: am 9eb142e3: am a9d49f99: Merge "Revert "Use asynchronous ↵Greg Hackmann2014-05-093-113/+13
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lock/unlock API"" * commit '9493d4924a59f14b698389386337a9c07a7ea3c4': Revert "Use asynchronous lock/unlock API"
| * | | | | am 9eb142e3: am a9d49f99: Merge "Revert "Use asynchronous lock/unlock API""Greg Hackmann2014-05-093-113/+13
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '9eb142e34a5bc11508c0bd6f60ad3933c60aa530': Revert "Use asynchronous lock/unlock API"
| | * | | | 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 4b46776f: am 8a6cd189: am f60564a1: Merge "Use asynchronous lock/unlock API"Greg Hackmann2014-05-093-13/+113
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '4b46776ff88c5a365700b88e8b2b04e1b2c77e6e': Use asynchronous lock/unlock API
| * | | | | | am 8a6cd189: am f60564a1: Merge "Use asynchronous lock/unlock API"Greg Hackmann2014-05-093-13/+113
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '8a6cd189034ec4709a66e581b41deba56c028291': Use asynchronous lock/unlock API
| | * | | | | 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 114d71ce: am 214b4a61: am 8155ce81: Merge "Remove unused LOCAL_LDLIBS."Ying Wang2014-05-081-2/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | | * commit '114d71ce7c6ec1ce0327c812a42966c4258b4a46': Remove unused LOCAL_LDLIBS.
| * | | | | am 214b4a61: am 8155ce81: Merge "Remove unused LOCAL_LDLIBS."Ying Wang2014-05-071-2/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '214b4a61ac3fa63e35c79157d3acf0d8b692b3ac': Remove unused LOCAL_LDLIBS.
| | * | | | 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 424b093a: am ef923fcf: Merge "fix GraphicBuffer::flatten crash issue when ↵Jesse Hall2014-05-051-2/+4
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handle is null" * commit '424b093a58c9f428081da991afa347183bf07847': fix GraphicBuffer::flatten crash issue when handle is null
| | * | | | 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>
* | | | | | Merge "Fix InputEvent_test."Narayan Kamath2014-05-071-5/+5
|\ \ \ \ \ \
| * | | | | | Fix InputEvent_test.Narayan Kamath2014-05-061-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Axis 0 sets the MSB and Axis 63 sets the LSB, and not the other way round like the test expects. This was broken by commit 38dcdff3087f01 which moved this code over to using BitSet. Change-Id: I63a72abe7ce14720b0bf26e5f6d651bb42452f79
* | | | | | | Merge "Enable changing display configuration"Dan Stoza2014-05-062-10/+87
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Enable changing display configurationDan Stoza2014-05-052-10/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows querying and switching display device configurations through the ISurfaceComposer/SurfaceComposerClient interface. Bug: 14320401 Change-Id: I8c22165698950e5da32204c1c4da92122f91a715
* | | | | | | Merge "Change InputMessage.motion.pointerSize to a uint32_t."Narayan Kamath2014-05-061-8/+8
|\ \ \ \ \ \ \
| * | | | | | | Change InputMessage.motion.pointerSize to a uint32_t.Narayan Kamath2014-05-021-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. Change-Id: I66bb8b8d8664763e7dcbd489686051f563d5e1dc
* | | | | | | am 57fdbbda: am 4314ccd1: am 70278fbf: Merge "Add error message for hints ↵Jesse Hall2014-05-051-1/+6
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | | | | | | | | | | | | | | | | | | when exceptions occur during binder transactions." * commit '57fdbbda2c475d2abdd828177f942ddb6d164bef': Add error message for hints when exceptions occur during binder transactions.
| * | | | | am 4314ccd1: am 70278fbf: Merge "Add error message for hints when exceptions ↵Jesse Hall2014-05-051-1/+6
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | occur during binder transactions." * commit '4314ccd1ba9fe773b0fc91f0a08dc536ebce8dfe': Add error message for hints when exceptions occur during binder transactions.
| | * | | | 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
| | | * \ \ \ 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
| | | * \ \ \ \ 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.