Commit Graph

50687 Commits

Author SHA1 Message Date
Riley Andrews
03414a1cfe Turn on support for async cursor update in surfaceflinger.
If available, surfaceflinger will use the hwc setCursorPositionAsync()
api to change the position of supported cursor layers outside of
the usual prepare/set loop.

Change-Id: Ib3fc5c0c390b3489ddbba202379840a1d2748917
2014-07-28 22:07:41 +00:00
Antoine Labour
bd7b9443d9 am d8e5e813: Merge "BufferQueueProducer: fix which slot gets pre-allocated" into lmp-dev
* commit 'd8e5e813433c5c5e4fea29a24d993b5cfe436fe0':
  BufferQueueProducer: fix which slot gets pre-allocated
2014-07-26 02:14:08 +00:00
Lajos Molnar
a0c3a207b5 am 524077ca: OMX: add supporting methods for flexible YUV
* commit '524077caa6a5e5508af40cf2012d45087ed9e7f3':
  OMX: add supporting methods for flexible YUV
2014-07-26 02:00:40 +00:00
Lajos Molnar
524077caa6 OMX: add supporting methods for flexible YUV
Bug: 10706245
Change-Id: I2427930a34c468e49d3db7ba2865344f1fba2960
2014-07-25 18:06:37 -07:00
Michael Lentine
cd36eb445b Merge "Modify EGL to disconnect the window when the surface gets destroyed." into lmp-dev 2014-07-25 21:16:23 +00:00
Michael Lentine
843cbb241d Modify EGL to disconnect the window when the surface gets destroyed.
Bug: 14445579

Change-Id: I1d263ff6cffcb6e448761fca7ca4b06466ad65aa
2014-07-29 18:59:56 -07:00
Antoine Labour
d8e5e81343 Merge "BufferQueueProducer: fix which slot gets pre-allocated" into lmp-dev 2014-07-25 21:16:23 +00:00
Antoine Labour
11f14871db BufferQueueProducer: fix which slot gets pre-allocated
Commit 78014f32da introduced a bug that
made us pre-allocate buffers into the last available free slots instead
of the first available ones. This in turn caused more re-allocations,
and possibly triggered driver bugs.

Change-Id: Ic4a70e676b4f2bbb054bc873be62ced26e3099a0
2014-07-25 18:47:25 -07:00
Aravind Akella
330cf47336 Merge "Remove WAKE_UP_* sensor constants." into lmp-dev 2014-07-25 21:16:23 +00:00
Aravind Akella
fd8498c41e Remove WAKE_UP_* sensor constants.
Change-Id: I3de9d114ce82de4ed841932747d72e1f6f73c24f
2014-07-28 18:01:11 -07:00
Aravind Akella
6f3a236f56 am c268068c: Merge "SensorService performance improvements." into lmp-dev
* commit 'c268068c55afaaa441fda903b1b84a5b5c8a0a01':
  SensorService performance improvements.
2014-07-25 19:11:59 +00:00
Eric Penner
0c92547d87 am 22956874: Merge "GLProducer: Reference count images rather than buffers." into lmp-dev
* commit '2295687487a0f2cc3e77915d5b0fe794d3af4d20':
  GLProducer: Reference count images rather than buffers.
2014-07-24 23:34:09 +00:00
Ying Wang
82a93225a0 am d1ceb8b7: Install symlinks in multilib build.
* commit 'd1ceb8b78f4823c58185a22c5dd047c4174f91b1':
  Install symlinks in multilib build.
2014-07-24 23:32:37 +00:00
Christopher Ferris
06ad7bf518 am 7dc7f322: Add dumping of tombstones to dumpstate.
* commit '7dc7f3221f26b771c266a26ec785eb74287922f1':
  Add dumping of tombstones to dumpstate.
2014-07-24 19:48:11 +00:00
Ying Wang
d1ceb8b78f Install symlinks in multilib build.
(cherry picked from commit c3aed1eaef)

Change-Id: Ic0082ffbd7ecf610476bccb0929e67427a05190d
2014-07-24 10:36:55 -07:00
Aravind Akella
c268068c55 Merge "SensorService performance improvements." into lmp-dev 2014-07-24 15:37:54 +00:00
Aravind Akella
56ae42613c SensorService performance improvements.
i) Send ack for wake_up sensors on the socket connection instead of using Binder RPC.
  ii) Cache events per connection in case there are write failures. Compute cache size
      from FIFO counts of sensors.
 iii) Send FlushCompleteEvent only for apps that explicitly called flush().

Change-Id: I018969736b7794b1b930529586f2294a03ee8667
2014-07-24 17:23:01 -07:00
Eric Penner
2295687487 Merge "GLProducer: Reference count images rather than buffers." into lmp-dev 2014-07-24 15:36:21 +00:00
Christopher Ferris
7dc7f3221f Add dumping of tombstones to dumpstate.
Dump only those tombstones modified within the last half an hour.

Change-Id: I8ce836b2e19eba7a9c0c31a4f312f9a382526da7
2014-07-23 19:18:07 -07:00
Christopher Ferris
672e3a51bd resolved conflicts for merge of e8878921 to lmp-dev-plus-aosp
Change-Id: I930dda54336a3f6d694cec06299f09e3580671a0
2014-07-23 18:03:00 -07:00
Chong Zhang
27981c1aa6 am 2cbba477: add noteResetVideo/Audio to IBatteryStats
* commit '2cbba477bea136698944ece498115dbddd7bb659':
  add noteResetVideo/Audio to IBatteryStats
2014-07-23 22:04:39 +00:00
Chong Zhang
2cbba477be add noteResetVideo/Audio to IBatteryStats
Bug: 12979595
Change-Id: Ida474e539a3af0a85ec157a66bbf986430c8020e
2014-07-23 21:51:56 +00:00
Colin Cross
fb3c1a11e9 am 45e695a2: Merge "crash if getNativeBuffer() called on NULL GraphicBuffer" into lmp-dev
* commit '45e695a248ab9548c1e8ab976572f7a978ecd64b':
  crash if getNativeBuffer() called on NULL GraphicBuffer
2014-07-23 20:05:26 +00:00
Ying Wang
f65eb9bffd am e9105be3: Merge "Install symlinks in multilib build."
* commit 'e9105be32f6856dcb4fa67bd9f9a4fa91bff9b97':
  Install symlinks in multilib build.
2014-07-23 19:25:18 +00:00
Christopher Ferris
e8878921db Merge "Add dumping of tombstones to dumpstate." 2014-07-23 18:56:15 +00:00
Christopher Ferris
1fe6107b66 Add dumping of tombstones to dumpstate.
Dump only those tombstones modified within the last half an hour.

Change-Id: I8ce836b2e19eba7a9c0c31a4f312f9a382526da7
2014-07-23 16:33:01 -07:00
Colin Cross
45e695a248 Merge "crash if getNativeBuffer() called on NULL GraphicBuffer" into lmp-dev 2014-07-23 18:56:15 +00:00
Ying Wang
e9105be32f Merge "Install symlinks in multilib build." 2014-07-23 18:56:15 +00:00
Ying Wang
c3aed1eaef Install symlinks in multilib build.
Change-Id: Ia8a4995de127c42beebb3fe603366ce29a6f94d3
2014-07-23 11:55:43 -07:00
Hans Boehm
88b7541d68 Remove incorrect android_atomic_...64 use.
Change the mExtras field in Binder.h to be a stdatomic.h atomic
value, and replace references to it with proper stdatomic.h calls.
This removes one of a small number of remaining 64 bit
android_atomic references.  It also replaces the erroneously
non-atomic read accesses to mExtras.

It would be better if this used the C++11 <atomic> facility,
but we don't quite have that yet.

Bug: 16513433
Change-Id: Ibabb88d05025187ee1ce6c7f1aa670b133a547f8
2014-07-23 11:35:13 -07:00
Colin Cross
18fae75350 crash if getNativeBuffer() called on NULL GraphicBuffer
If getNativeBuffer() is called on a NULL GraphicBuffer the
static_cast of this from GraphicBuffer* to ANativeWindowBuffer*
will return a small pointer like (ANativeWindowBuffer*)0x10.
This value can propagate past NULL checks until it causes a crash
far away from the original NULL pointer.  Crash immediately
instead.

Change-Id: Id614b9eb1484108b3c3c733545309844c4b87532
2014-07-22 17:47:03 -07:00
Chong Zhang
12d6575220 am 9b365296: Merge "update battery status for audio/video" into lmp-dev
* commit '9b365296a745751c08731f369435e00682165f18':
  update battery status for audio/video
2014-07-23 00:14:28 +00:00
Chong Zhang
9b365296a7 Merge "update battery status for audio/video" into lmp-dev 2014-07-22 21:50:21 +00:00
Chong Zhang
bd42d38b16 update battery status for audio/video
Bug: 12979595

Change-Id: Ic8e8d625becc6d1050f840ad63b7423f388eeba3
2014-07-22 23:08:53 +00:00
Antoine Labour
27bda67f30 am 78014f32: BufferQueue: release mutex while allocating. DO NOT MERGE
* commit '78014f32da6d0ebf52fb34ebb7663863000520a0':
  BufferQueue: release mutex while allocating. DO NOT MERGE
2014-07-22 21:47:39 +00:00
Antoine Labour
78014f32da BufferQueue: release mutex while allocating. DO NOT MERGE
BufferQueueProducer::allocateBuffers used to keep the BufferQueueCore
mutex while doing the buffer allocation, which would cause the consumer
(which also needs the mutex) to block if the allocation takes a long
time.
Instead, release the mutex while doing the allocation, and grab it again
before filling the slots. Keep a bool state and a condvar to prevent
other producers from trying to allocate the slots while the mutex is
released.

Bug: 11792166

Change-Id: I4ab1319995ef892be2beba892f1fdbf50ce0416d
(cherry picked from commit ea96044470)
2014-07-22 19:45:55 +00:00
Eric Penner
5c3d243fcc GLProducer: Reference count images rather than buffers.
In most cases, EGLImages can be created one-to-one with graphic
buffers in slots, but that was difficult due to some special
cases:
- ReleaseTexImage binds a custom 'unslotted' debug image.
- When all slots are freed, we still need to hang on to one.

These cases were handled by keeping an additional reference to
the 'current' buffer (mCurrentTextureBuf), but we would create
new images since we can't reference count them in the same way.
This patch uses the same semantics, except that it reference
counts the image (an EglImage wrapper class) rather than just
buffer. The wrapper class also detects the cases when we need
a new EGLImage, and only creates them in those rare cases.

Change-Id: I2915761dbe49d2a9bda1f59e60f857543634636b
2014-07-21 18:16:12 -07:00
Ben Clayton
c537748512 am 7b3f48d2: Use the count parameter to store all the uniform vectors, not just the first one. DO NOT MERGE.
* commit '7b3f48d2efc83094de70c24520bafacda3749a20':
  Use the count parameter to store all the uniform vectors, not just the first one. DO NOT MERGE.
2014-07-21 15:11:53 +00:00
Jesse Hall
244e4662db am c6414d13: Merge "Add OpenGL ES AEP feature xml." into lmp-dev
* commit 'c6414d13a3611f9e29eac11a037c7c51b94d0c58':
  Add OpenGL ES AEP feature xml.
2014-07-21 12:40:28 +00:00
Ben Clayton
7b3f48d2ef Use the count parameter to store all the uniform vectors, not just the first one. DO NOT MERGE.
Change-Id: Ib56d859051f0b895de5c12ffa371cd4b2b65ac0b
(cherry picked from commit 31b0aec64b)
2014-07-21 09:52:48 +00:00
Elliott Hughes
a4e55ae915 am d2a04922: Always #include <sys/...>, not <linux/...>.
* commit 'd2a049220a8299ab19a96d6dcc12b7034da28d28':
  Always #include <sys/...>, not <linux/...>.
2014-07-20 18:02:21 +00:00
Elliott Hughes
198baa3c5e am 119b765a: Fix implicit declaration of function \'prctl\' in installd.
* commit '119b765a053f650b4b47256245ce836f8c403d7f':
  Fix implicit declaration of function 'prctl' in installd.
2014-07-20 18:00:45 +00:00
Jesse Hall
c6414d13a3 Merge "Add OpenGL ES AEP feature xml." into lmp-dev 2014-07-20 04:41:30 +00:00
Elliott Hughes
d2a049220a Always #include <sys/...>, not <linux/...>.
(cherry picked from commit 1e4ee9afd2)

Change-Id: Ie005774484f98bb33c8f867cddb778ac04a1d4ea
2014-07-18 18:19:54 -07:00
Elliott Hughes
8acb810235 am 76cbbc07: Merge "Always #include <sys/...>, not <linux/...>."
* commit '76cbbc07ea98d2a2f75173fe7ba5444d44ebd99f':
  Always #include <sys/...>, not <linux/...>.
2014-07-19 01:01:01 +00:00
Elliott Hughes
6fd0408de1 am 4dd0d800: Merge "Fix implicit declaration of function \'prctl\' in installd."
* commit '4dd0d8008a84d1b8e5d9cae2a3491fa92b79c388':
  Fix implicit declaration of function 'prctl' in installd.
2014-07-19 00:38:11 +00:00
Elliott Hughes
119b765a05 Fix implicit declaration of function 'prctl' in installd.
(cherry picked from commit ec535c5ba5)

Change-Id: I3da977d85ce544b23ff00934fdbd201d683e9210
2014-07-18 17:30:32 -07:00
Jesse Hall
abc8098fcb Add OpenGL ES AEP feature xml.
Bug: 15593761
Change-Id: Ia961c64c5bf33da752518921c570c7f6dafe724e
2014-07-18 14:25:39 -07:00
Jeff Brown
4d8ee47d92 am 31d825d7: Add glance gesture for doze mode.
* commit '31d825d7edcaac7254f310d3cf85af9fc1927c25':
  Add glance gesture for doze mode.
2014-07-18 03:16:59 +00:00
Jeff Brown
31d825d7ed Add glance gesture for doze mode.
Change-Id: I038a706c3999200313ff5360c5ff1150ec081f08
2014-07-17 18:19:53 -07:00