Aravind Akella
cf818ebbf0
Merge "Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors" into klp-modular-dev
2014-04-11 19:32:28 +00:00
Aravind Akella
700180487f
Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors
...
This reverts commit 4369a4ebd5
.
Change-Id: Ifa8619cc6873470a07a987763d818d78d4232610
2014-04-11 00:06:06 +00:00
Etienne Le Grand
4369a4ebd5
Revert "Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors"
...
This reverts commit c57a019e11
.
Change-Id: I3540565bc3e56a32cf3b176a29216cf68bb763b2
2014-04-05 05:02:22 +00:00
Etienne Le Grand
c57a019e11
Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors
...
Change-Id: If0f3dbdb5d2e9378e1fed4614baee4e750d0c850
2014-04-04 16:31:09 -07:00
Andy McFadden
87a6784780
Always release a buffer
...
In GLConsumer's updateAndReleaseLocked(), we must release either
the previously-acquired buffer or the newly-acquired buffer.
Bug 13755224
Change-Id: I96adc255400ed008ba6e6ac1725ab3514c7cc8ba
2014-04-04 15:37:08 -07:00
Michael Wright
d0bd391146
Generate ACTION_CANCEL on joystick disconnect. DO NOT MERGE
...
Bug: 11480300
Change-Id: I5a4096970c9e588d134f05dd0eb3a9c91c836b2f
2014-03-24 17:26:52 -07:00
Kenny Root
38e2aaaa3d
am 5b61ad2c
: Check the padded size of the read byte array
...
* commit '5b61ad2cda8ec8ab634ce02f388bb2d3c5ab048d':
Check the padded size of the read byte array
2014-03-17 21:28:34 +00:00
Kenny Root
5b61ad2cda
Check the padded size of the read byte array
...
Bug: 13509200
Change-Id: Id93894fcc617ec1cd4ce66921c6e1f1c3cf40b09
2014-03-17 13:18:16 -07:00
Marco Nelissen
b730a45216
am f0190bff
: Add support for writing byte arrays to parcels
...
* commit 'f0190bff38b6c29abbfc4a877442f71fc3d7dad8':
Add support for writing byte arrays to parcels
2014-03-14 22:55:54 +00:00
Marco Nelissen
f0190bff38
Add support for writing byte arrays to parcels
...
b/13418320
Change-Id: I2285df9e9d3dc8a6a54055b13b352b81660bf45d
2014-03-13 14:17:40 -07:00
Michael Wright
962a108856
Parse LED mappings in keylayout files. DO NOT MERGE
...
Change-Id: I2b34939cc0df256e6b872502ea93f2884b4c8334
2014-03-03 13:59:35 -08:00
Arve Hjønnevåg
d5a354c6b7
am d06f6b00
: am 67903293
: Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface
...
* commit 'd06f6b001484c28a6ede3f1ad83d23dcb9ad3ccf':
Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface
2014-02-20 00:04:44 +00:00
Arve Hjønnevåg
d06f6b0014
am 67903293
: Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface
...
* commit '6790329358d1c84af2fe9ba093bcfc1c6176e758':
Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface
2014-02-20 00:00:49 +00:00
Arve Hjønnevåg
6790329358
Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface
...
DO NOT MERGE into any branch that uses the new interface
Change-Id: Id54308a89327e69a389ac5916c052ad97f57cb28
2014-02-19 15:35:52 -08:00
Arve Hjønnevåg
e45636a867
am d437364e
: am f50b9eaa
: Binder: Make sure binder objects do not overlap
...
* commit 'd437364ec156e07c5fbe3fa27a7cd55e5450e9f6':
Binder: Make sure binder objects do not overlap
2014-02-19 21:47:35 +00:00
Arve Hjønnevåg
d437364ec1
am f50b9eaa
: Binder: Make sure binder objects do not overlap
...
* commit 'f50b9eaaeeaeae16981f11b05d3f3a6fb0dea30d':
Binder: Make sure binder objects do not overlap
2014-02-19 21:45:25 +00:00
Andy McFadden
44c35ec4a9
Allow "opaque" flag to be updated. DO NOT MERGE
...
Moves the "opaque layer" from Layer to Layer::State. This allows
it to be updated as part of a transaction.
Bug 12387406
Change-Id: I0a114ce6adf77cd12fb08f96e0691b76c475768d
2014-02-18 15:55:42 -08:00
Arve Hjønnevåg
f50b9eaaee
Binder: Make sure binder objects do not overlap
...
Fixes crashing part of bug 11355082.
The driver still leaks references.
Change-Id: Ibc6a63b151c1fc1f7666237f25255ba781e02071
2014-02-15 03:44:17 +00:00
Jeff Brown
ed4d28dd70
Add method to apply offset to PointerCoords. (DO NOT MERGE)
...
Change-Id: I3dc2ba22b026e5b8e1c3d90f7366ec09a59ce6b6
2014-02-11 14:43:19 -08:00
Elliott Hughes
0d103b596d
am f2f74ca6
: Merge "Remove references to obsolete pmem functionality."
...
* commit 'f2f74ca65f34ae0cae6f0cca40f1c18aa771739d':
Remove references to obsolete pmem functionality.
2013-11-21 18:43:51 -08:00
Elliott Hughes
a5a13a3ecf
Remove references to obsolete pmem functionality.
...
Change-Id: I5d3befd075e51614e6801115388a0a9f32fbb6ea
2013-11-21 12:22:39 -08:00
Marco Nelissen
fddab47617
am 708cc794
: Native counterpart of new power manager method
...
* commit '708cc794f6ccd4d31e0a00a23b289272c665adc1':
Native counterpart of new power manager method
2013-10-25 15:01:29 -07:00
Marco Nelissen
708cc794f6
Native counterpart of new power manager method
...
Cherrypicked from master.
b/9464621
Change-Id: I54c0ed50a57ac870da91db8589a73a2c792dbd8d
2013-10-25 12:50:04 -07:00
Shuo Gao
0a885309aa
fix corruption in Vector<> when malloc falied
...
1. When alloc or realloc failed in the function SharedBuffer::editResize,
it would return a NULL pointer, then mStorage would update to be 1 by
SharedBuffer::data() if no pointer check here, which is an obviously
wrong address, and would cause corruption when used it e.g. in capacity().
So add the pointer check here for the return value of SharedBuffer::editResize,
if it's NULL do not use it to update mStorage, to avoid the value of mStorage
polluted.
2. when alloc or realloc falied in _grow & _shrink function, mStorage keep
the original value, so mCount should not be updated here.
Otherwise, mStorage might be 0 but mCount>0, so a corruption would happend
when it try to delete items from the Vector since mCount>0.
Change-Id: I7c3814e843c459834ca5eed392e8d63d1cb7d2d8
Signed-off-by: Shuo Gao <shuo.gao@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: 139626
2013-10-22 22:36:46 -07:00
Michael Wright
47f0b9894b
am 3223217a
: Only consume touches up until the frame time
...
* commit '3223217aed6dcfa55b5b952cd6be71f70e41ba63':
Only consume touches up until the frame time
2013-10-21 17:23:55 -07:00
Michael Wright
3223217aed
Only consume touches up until the frame time
...
When resampling is disabled, it's currently possible to consume
touches after the current frame time. This breaks some guarantees and
could cause unexpected behaviors.
Change-Id: I99908a2cac2df9f795dd4a07188b4451213cf3e4
2013-10-21 23:57:17 +00:00
Andy McFadden
251b11c204
am 85075869
: Wait for buffers to drain
...
* commit '8507586903fa803abf535853a169913f2cf2e555':
Wait for buffers to drain
2013-10-18 16:57:01 -07:00
Andy McFadden
8507586903
Wait for buffers to drain
...
When a BufferQueue producer disconnects and reconnects, we retain
the previously-queued buffers but empty the slots. This allows
the number of queued buffers to grow without limit. The low-memory
killer does not approve.
Bug 11069934
Change-Id: Ia2eaa954c7a3904b54209a3701dba01689e204d8
2013-10-18 23:10:16 +00:00
Dave Burke
06c964d9b3
am 9c0dfa09
: Merge "Eliminate latency when resampling is disabled" into klp-dev
...
* commit '9c0dfa09731a8366a7cdcd7171dde64b73af0d5c':
Eliminate latency when resampling is disabled
2013-10-10 19:39:05 -07:00
Dave Burke
9c0dfa0973
Merge "Eliminate latency when resampling is disabled" into klp-dev
2013-10-11 02:33:15 +00:00
Aravind Akella
1f1e576840
am 5d6aa951
: Merge "Change API from flush(handle) to flush(). Call flush on all active sensors in the given SensorEventConnection." into klp-dev
...
* commit '5d6aa95129a13aae37a60b3e4246a0592dab396d':
Change API from flush(handle) to flush(). Call flush on all active sensors in the given SensorEventConnection.
2013-10-10 19:21:05 -07:00
Michael Wright
ad526f8505
Eliminate latency when resampling is disabled
...
Since the latency was introduced to avoid egregious errors during
resampling, remove it when we aren't resampling.
Change-Id: Ia8e9a9afb1e16212fec81a8c9c661c598e1b0ebf
2013-10-10 18:54:12 -07:00
Aravind Akella
701166d9f6
Change API from flush(handle) to flush(). Call flush on all active sensors in the given SensorEventConnection.
...
Change-Id: I4ef2bec80406c517903ab9782dc9eaf3fa8b7f36
2013-10-09 17:26:01 -07:00
Jamie Gennis
6be1d210ee
am f0cf5f10
: BufferQueue: fix a test crash
...
* commit 'f0cf5f103cf9c54d59de4ed6f1d8ddd2302dec1b':
BufferQueue: fix a test crash
2013-10-02 11:16:59 -07:00
Jamie Gennis
f0cf5f103c
BufferQueue: fix a test crash
...
Bug: 10935880
Change-Id: If76e9fb055103bad0db7e6c16487532671573149
2013-10-02 18:02:28 +00:00
Jamie Gennis
886b152111
am a9c47f32
: Merge "GLConsumer: start using EGL_ANDROID_image_crop" into klp-dev
...
* commit 'a9c47f327373cbe48e187442c7f9554d24a75c08':
GLConsumer: start using EGL_ANDROID_image_crop
2013-10-02 10:41:58 -07:00
Jamie Gennis
dbe9245e2e
GLConsumer: start using EGL_ANDROID_image_crop
...
This change makes GLConsumer use the EGL_ANDROID_image_crop extension when
available on a device. The crop rectangle is passed to the EGL driver when
creating EGLImages, allowing the crop to be performed by the driver rather than
using the texture transform matrix.
Bug: 10897141
Change-Id: I63e9a5d5c85067376abc420e3639154468346311
2013-10-02 17:34:35 +00:00
Eino-Ville Talvala
1160e89d31
am d171da97
: GLConsumer: Add query for current frame number.
...
* commit 'd171da973de3c6b30263011334fdcd916739144f':
GLConsumer: Add query for current frame number.
2013-09-19 14:59:51 -07:00
Eino-Ville Talvala
d171da973d
GLConsumer: Add query for current frame number.
...
Surface the underlying frame number of the current texture.
Bug: 10830400
Change-Id: Ide3a7da12ea0aac54588beb6bf00dbfe2cd37653
2013-09-19 13:36:07 -07:00
Mathias Agopian
a7e1660b25
am c1c05de4
: fix camera API 2.0 orientation
...
* commit 'c1c05de415854eb7a13a16b7e22a22de8515123a':
fix camera API 2.0 orientation
2013-09-18 15:33:38 -07:00
Mathias Agopian
c1c05de415
fix camera API 2.0 orientation
...
we add a flag to ANativeWindow::setBufferTransform that means
"apply the inverse rotation of the display this buffer is displayed
onto to".
Bug: 10804238
Change-Id: Id2447676271950463e8dbcef1b95935c5c3f32b2
2013-09-17 23:45:22 -07:00
Mathias Agopian
e803e6095e
am 799f5126
: Fix build (tests)
...
* commit '799f51268006f319f6ae538dca670bfc7f522688':
Fix build (tests)
2013-09-17 15:58:55 -07:00
Mathias Agopian
799f512680
Fix build (tests)
...
Change-Id: I5b233ef448e5e7eec3818c6586dfea138b28f7b6
2013-09-17 15:55:18 -07:00
Mathias Agopian
3f342c1133
am 02b62df7
: Merge "Make sure do disconnect from a BQ when its client dies." into klp-dev
...
* commit '02b62df7119b27c89d91d96938d8f4f5232b296b':
Make sure do disconnect from a BQ when its client dies.
2013-09-17 14:33:09 -07:00
Mathias Agopian
02b62df711
Merge "Make sure do disconnect from a BQ when its client dies." into klp-dev
2013-09-17 21:31:14 +00:00
Jesse Hall
b8080d9a3b
am 2a36497e
: Merge "Stop using default value for Surface producerControlledByApp parameter" into klp-dev
...
* commit '2a36497e45d4d96e35fed89cfdcb09b71459ac3c':
Stop using default value for Surface producerControlledByApp parameter
2013-09-16 20:30:11 -07:00
Mathias Agopian
365857df8b
Make sure do disconnect from a BQ when its client dies.
...
Bug: 5679534
Change-Id: If447e8673df83fe0b1d6210641e0a48522501a53
2013-09-16 16:15:21 -07:00
Jesse Hall
83cafffeac
Stop using default value for Surface producerControlledByApp parameter
...
Bug: 10785749
Change-Id: Ifbf9340e5eabe621a69e990ec3e05ac51f8db66a
2013-09-16 15:39:55 -07:00
Kenny Root
06ef81bd70
resolved conflicts for merge of 1852eb4f
to klp-dev-plus-aosp
...
Change-Id: I7217c0e859b384a042c02fe339e745996c6ef49e
2013-09-12 11:51:34 -07:00
Mathias Agopian
7c4f236532
am 90ed3e8d
: fix a few problems with BitTube
...
* commit '90ed3e8d7883d9c80fb8bf11b1c593bd8b2b39d0':
fix a few problems with BitTube
2013-09-11 15:06:10 -07:00