OSDN Git Service
The Android Open Source Project [Tue, 11 Dec 2012 19:57:07 +0000 (11:57 -0800)]
am
0c6fff72: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '
0c6fff72f78e4f80b28ccccac9584255591dd1a2':
The Android Open Source Project [Tue, 11 Dec 2012 19:54:26 +0000 (11:54 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I946e9036a50464f974bc2d12df9d8b119f86fa00
The Android Automerger [Tue, 11 Dec 2012 03:33:41 +0000 (19:33 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Jamie Gennis [Tue, 11 Dec 2012 01:59:34 +0000 (17:59 -0800)]
am
884e3bc2: (-s ours) am
6426bd62: am
f53f9c6d: [DO NOT MERGE] GraphicBufferAllocator: stall alloc for async frees
* commit '
884e3bc29ed190a856f7562a73548868a7ecef2f':
[DO NOT MERGE] GraphicBufferAllocator: stall alloc for async frees
Jamie Gennis [Tue, 11 Dec 2012 01:58:33 +0000 (17:58 -0800)]
am
6426bd62: am
f53f9c6d: [DO NOT MERGE] GraphicBufferAllocator: stall alloc for async frees
* commit '
6426bd62676c743b0b5bdc397bcab5c669c6e51f':
[DO NOT MERGE] GraphicBufferAllocator: stall alloc for async frees
Jamie Gennis [Tue, 11 Dec 2012 01:57:40 +0000 (17:57 -0800)]
am
f53f9c6d: [DO NOT MERGE] GraphicBufferAllocator: stall alloc for async frees
* commit '
f53f9c6d3668490f6c68f5c094c28f645c1b3da3':
[DO NOT MERGE] GraphicBufferAllocator: stall alloc for async frees
Jamie Gennis [Tue, 11 Dec 2012 01:06:44 +0000 (17:06 -0800)]
[DO NOT MERGE] GraphicBufferAllocator: stall alloc for async frees
This change makes GraphicBufferAllocator::alloc wait for pending async frees to
complete before attempting to allocate a gralloc buffer if there are more than
8 pending async frees.
Bug:
7696861
Change-Id: I1fae86e13edefcaa153b8ce9fd057f335716059e
The Android Open Source Project [Mon, 10 Dec 2012 23:23:22 +0000 (15:23 -0800)]
am
064d2529: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '
064d252918c23cc4c90f8bc62f9ae47ba7afa4d5':
The Android Open Source Project [Mon, 10 Dec 2012 23:19:43 +0000 (15:19 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I97991f966ea0d3a6f3bad87c82d9926d55e6d63c
Jamie Gennis [Sat, 8 Dec 2012 00:29:03 +0000 (16:29 -0800)]
atrace: fix the help string
Change-Id: I19f0093d65d64e669ad71c600c103f4080bfa2c2
Jamie Gennis [Fri, 7 Dec 2012 23:42:15 +0000 (15:42 -0800)]
SurfaceFlinger: work around a driver bug
Change-Id: I4490f308b12e9b6fda2ea7255eb19d867d6d008c
Jamie Gennis [Fri, 7 Dec 2012 22:03:07 +0000 (14:03 -0800)]
atrace: clean up tracing option enabling
This change switches atrace to use a table-driven approach to enabling and
disabling options. It unifies how framework and kernel tracing are enabled,
and causes userland tracing options to be picked up by currently running
processes.
Change-Id: Iba2a3012ca0a67c4defdd076bce597db26e9f539
The Android Automerger [Fri, 7 Dec 2012 21:26:18 +0000 (13:26 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Jamie Gennis [Fri, 7 Dec 2012 19:09:12 +0000 (11:09 -0800)]
am
50f8d285: am
d4e70620: am
72c3f7d8: Revert "ConsumerBase: free buffers outside the lock"
* commit '
50f8d2856b6644059b31684687842bf9c1f2e814':
Revert "ConsumerBase: free buffers outside the lock"
Jamie Gennis [Fri, 7 Dec 2012 19:07:03 +0000 (11:07 -0800)]
am
d4e70620: am
72c3f7d8: Revert "ConsumerBase: free buffers outside the lock"
* commit '
d4e706208c99ff1716fb0009ec867ff29ff04a7c':
Revert "ConsumerBase: free buffers outside the lock"
Jamie Gennis [Fri, 7 Dec 2012 19:04:51 +0000 (11:04 -0800)]
am
72c3f7d8: Revert "ConsumerBase: free buffers outside the lock"
* commit '
72c3f7d88160b7c279f90f0efe3c1cb12cd140ae':
Revert "ConsumerBase: free buffers outside the lock"
Jamie Gennis [Fri, 7 Dec 2012 19:00:33 +0000 (11:00 -0800)]
am
7df16644: (-s ours) am
2d659286: am
2e59d2c3: DO NOT MERGE GraphicBufferAllocator: make frees async
* commit '
7df16644c4e5fbb30d011b9098d9c8833f89f0aa':
DO NOT MERGE GraphicBufferAllocator: make frees async
Jamie Gennis [Fri, 7 Dec 2012 18:59:29 +0000 (10:59 -0800)]
am
2d659286: am
2e59d2c3: DO NOT MERGE GraphicBufferAllocator: make frees async
* commit '
2d659286b59dc7ff7378fe967f1c425e92155995':
DO NOT MERGE GraphicBufferAllocator: make frees async
Jamie Gennis [Fri, 7 Dec 2012 18:58:22 +0000 (10:58 -0800)]
am
2e59d2c3: DO NOT MERGE GraphicBufferAllocator: make frees async
* commit '
2e59d2c3fdc0bcfedbe9c5d04d7acadc3eff8887':
DO NOT MERGE GraphicBufferAllocator: make frees async
Jamie Gennis [Fri, 7 Dec 2012 08:41:56 +0000 (00:41 -0800)]
Revert "ConsumerBase: free buffers outside the lock"
This reverts commit
b21a4e3b5f7f07ed160ca6e1809313e2a8e2a6a4.
Jamie Gennis [Fri, 7 Dec 2012 08:38:36 +0000 (00:38 -0800)]
DO NOT MERGE GraphicBufferAllocator: make frees async
This change makes GraphicBufferAllocator::free queue a job to another thread to
perform the actual free operation. This prevents potentially slow free
operations from blocking rendering.
Bug:
7675940
Change-Id: Id61099d66bb4c3949d04184e0d7f192ac18076b4
The Android Open Source Project [Fri, 7 Dec 2012 15:56:46 +0000 (07:56 -0800)]
am
7bd5a76e: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '
7bd5a76e2e89ca6d172539ef2dfa43f42f07c001':
The Android Open Source Project [Fri, 7 Dec 2012 15:53:15 +0000 (07:53 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: Id716af997b29350c4600ae941107e96d27f1b0af
Jamie Gennis [Fri, 7 Dec 2012 07:24:25 +0000 (23:24 -0800)]
am
05989772: am
3ed2736c: am
b21a4e3b: ConsumerBase: free buffers outside the lock
* commit '
05989772d5b46cd5328e88d546f04deef39cc3c8':
ConsumerBase: free buffers outside the lock
The Android Automerger [Fri, 7 Dec 2012 03:36:11 +0000 (19:36 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Jamie Gennis [Fri, 7 Dec 2012 03:00:57 +0000 (19:00 -0800)]
am
3ed2736c: am
b21a4e3b: ConsumerBase: free buffers outside the lock
* commit '
3ed2736c10efb2f18062591e308036837d9725a4':
ConsumerBase: free buffers outside the lock
Jamie Gennis [Fri, 7 Dec 2012 02:37:24 +0000 (18:37 -0800)]
am
b21a4e3b: ConsumerBase: free buffers outside the lock
* commit '
b21a4e3b5f7f07ed160ca6e1809313e2a8e2a6a4':
ConsumerBase: free buffers outside the lock
Jamie Gennis [Fri, 7 Dec 2012 01:51:53 +0000 (17:51 -0800)]
ConsumerBase: free buffers outside the lock
This change makes ConsumerBase::onBuffersReleased hold a reference to all its
gralloc buffers until after the mutex is unlocked. This prevents slow
gralloc::free calls from causing lock contention with rendering threads.
Bug:
7675940
Change-Id: I0ec805d1b612afeeecfffec03f982371d27d93be
Chris Craik [Wed, 5 Dec 2012 18:36:45 +0000 (10:36 -0800)]
Add LinearAllocator
Moving from external/webkit/Source/WebCore/platform/graphics/android/utils/
Change-Id: If91830aa9b207dbc8692b2ca7c4a0b76778addd5
Ying Wang [Tue, 4 Dec 2012 20:04:44 +0000 (12:04 -0800)]
Use LOCAL_REQUIRED_MODULES to establish dependency
instead of using the tricky order-only dependency on a phony target
module name.
Change-Id: I691f2d352d1bd7f619bdb0b75070709e1b8222c0
Alex Ray [Sat, 1 Dec 2012 03:32:12 +0000 (19:32 -0800)]
utils: clarify scoped tracing functionality
ScopedTrace objects were being used in place of ATRACE_NAME because of a
misunderstanding of it's function. Cleared up documentation for usage.
Also explicitly use global namespace for sysprop callback.
Change-Id: I7c248b486b614ccdb841659ca0dcfc644fda670a
Jesse Hall [Thu, 29 Nov 2012 23:58:45 +0000 (15:58 -0800)]
Mark extensions 'Complete', correct some stale version info
Change-Id: I46ccd8eaeacc647399a5531e262c1b01e0a080b0
Chad Jones [Thu, 29 Nov 2012 23:13:36 +0000 (15:13 -0800)]
Remove copy of atrace imported to wrong location
Chad Jones [Thu, 29 Nov 2012 22:51:39 +0000 (14:51 -0800)]
Merge branch 'master' of https://googleplex-android.googlesource.com/a/platform/frameworks/native
Chad Jones [Thu, 29 Nov 2012 22:50:16 +0000 (14:50 -0800)]
Merge "Add the atrace utility."
Chad Jones [Thu, 29 Nov 2012 22:35:10 +0000 (14:35 -0800)]
Merge atrace/ from platform/system/extras to cmds/atrace/
Jesse Hall [Thu, 29 Nov 2012 22:21:48 +0000 (14:21 -0800)]
Merge "Initial draft of EGL_ANDROID_image_native_buffer"
Alex Ray [Thu, 29 Nov 2012 21:36:25 +0000 (13:36 -0800)]
Merge "utils: Use cutils tracing functionality."
Alex Ray [Thu, 15 Nov 2012 01:28:10 +0000 (17:28 -0800)]
utils: Use cutils tracing functionality.
Tracing functionality has moved to cutils.
Change-Id: Ie78ccc1d59dd5178f5058fbc3858a37f9adce552
Jesse Hall [Thu, 29 Nov 2012 00:18:03 +0000 (16:18 -0800)]
Initial draft of EGL_ANDROID_image_native_buffer
Change-Id: If9bdd27ffdb13fb85e9ef873b311d6721399f75f
Romain Guy [Thu, 29 Nov 2012 19:23:12 +0000 (11:23 -0800)]
Merge "Add LruCache::Iterator"
The Android Open Source Project [Thu, 29 Nov 2012 17:49:34 +0000 (09:49 -0800)]
am
6d93da46: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '
6d93da465ab8fff02728f268785e59ab86a2a0c2':
The Android Open Source Project [Thu, 29 Nov 2012 17:13:38 +0000 (09:13 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I83096147b7adbf5396fdb88114abce568b4ec0cc
The Android Automerger [Thu, 29 Nov 2012 15:09:35 +0000 (07:09 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Romain Guy [Thu, 29 Nov 2012 02:26:54 +0000 (18:26 -0800)]
Add LruCache::Iterator
Required by libhwui
Change-Id: I164b9a4a82d89d132da01a56535c0df084de86f7
Romain Guy [Thu, 29 Nov 2012 01:37:03 +0000 (17:37 -0800)]
Add another ifndef and a couple of methods to LruCache
The new methods on LruCache are needed by libhwui to manage
the cache of paths.
Change-Id: If54fa325c54e2b04e7fe5dfe6dad66066c40127c
Romain Guy [Wed, 28 Nov 2012 20:59:40 +0000 (12:59 -0800)]
Add #ifndef to prevent multiple definitions
Change-Id: Ib861eee0f333fe29290437b7e67623622d8dabd0
The Android Open Source Project [Wed, 28 Nov 2012 17:49:34 +0000 (09:49 -0800)]
am
31e84850: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '
31e8485028e93c16312c57b5bb6b511e3bc8582d':
workaround: don't reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE]
The Android Open Source Project [Wed, 28 Nov 2012 17:47:35 +0000 (09:47 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I7d22820ba101417d4dd982b642b45d80beb011f4
Mathias Agopian [Wed, 28 Nov 2012 02:43:52 +0000 (18:43 -0800)]
am
a7da0dda: am
98cbec81: am
efd614b8: Merge "make transform hint multi-display aware" into jb-mr1.1-dev
* commit '
a7da0dda39cf1e807eea1304b48d4583e7329b72':
make transform hint multi-display aware
Jesse Hall [Wed, 28 Nov 2012 02:42:41 +0000 (18:42 -0800)]
am
1e310d64: am
2004307b: Merge "Create builtin display tokens on demand"
* commit '
1e310d64d1e51faf35962f23da1c90ec95a35e5d':
Create builtin display tokens on demand
Andy McFadden [Wed, 28 Nov 2012 01:34:20 +0000 (17:34 -0800)]
am
db2e4f16: (-s ours) am
a90173d8: am
762a6d86: Merge "DO NOT MERGE - native_fence_sync: fix an enum name" into jb-mr1.1-dev
* commit '
db2e4f16bb1c804414773862030cdb0aa5413778':
DO NOT MERGE - native_fence_sync: fix an enum name
Mathias Agopian [Wed, 28 Nov 2012 00:10:29 +0000 (16:10 -0800)]
am
98cbec81: am
efd614b8: Merge "make transform hint multi-display aware" into jb-mr1.1-dev
* commit '
98cbec81be1d39223e33abde9ac35e43b62918bf':
make transform hint multi-display aware
Mathias Agopian [Wed, 28 Nov 2012 00:08:43 +0000 (16:08 -0800)]
am
efd614b8: Merge "make transform hint multi-display aware" into jb-mr1.1-dev
* commit '
efd614b869e952792b009db4ab54f3bb4375d198':
make transform hint multi-display aware
Mathias Agopian [Wed, 28 Nov 2012 00:07:04 +0000 (16:07 -0800)]
Merge "make transform hint multi-display aware" into jb-mr1.1-dev
The Android Automerger [Tue, 27 Nov 2012 23:34:35 +0000 (15:34 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Jesse Hall [Tue, 27 Nov 2012 20:59:56 +0000 (12:59 -0800)]
am
2004307b: Merge "Create builtin display tokens on demand"
* commit '
2004307b65c0cb34c854331e5be21d3426a3ef06':
Create builtin display tokens on demand
Jesse Hall [Tue, 27 Nov 2012 20:43:10 +0000 (12:43 -0800)]
Merge "Create builtin display tokens on demand"
Jesse Hall [Thu, 8 Nov 2012 23:41:56 +0000 (15:41 -0800)]
Create builtin display tokens on demand
For hotpluggable builtin displays (currently just HDMI), create the
display device IBinder token when the display is connected and destroy
it when the display is disconnected. Previously we created the tokens
at startup and never changed them. This made it so that when comparing
current and drawing state, we couldn't tell whether a display had been
disconnected and reconnected.
Bug:
7491120
Change-Id: I2ac82b864e10cb1cd0a308782d7e0ab9745c5d81
Andy McFadden [Tue, 27 Nov 2012 19:39:20 +0000 (11:39 -0800)]
am
a90173d8: am
762a6d86: Merge "DO NOT MERGE - native_fence_sync: fix an enum name" into jb-mr1.1-dev
* commit '
a90173d86dd209aee55d833c73c424d854a98c70':
DO NOT MERGE - native_fence_sync: fix an enum name
Andy McFadden [Tue, 27 Nov 2012 19:31:44 +0000 (11:31 -0800)]
am
762a6d86: Merge "DO NOT MERGE - native_fence_sync: fix an enum name" into jb-mr1.1-dev
* commit '
762a6d86de63ad319884ab6e666be6ad0d75996e':
DO NOT MERGE - native_fence_sync: fix an enum name
Andy McFadden [Tue, 27 Nov 2012 15:36:50 +0000 (07:36 -0800)]
Merge "DO NOT MERGE - native_fence_sync: fix an enum name" into jb-mr1.1-dev
Jamie Gennis [Mon, 26 Nov 2012 21:54:56 +0000 (13:54 -0800)]
DO NOT MERGE - native_fence_sync: fix an enum name
This change replaces all references to the "EGL_NO_NATIVE_FENCE_ANDROID" enum
with "EGL_NO_NATIVE_FENCE_FD_ANDROID".
Bug: http://code.google.com/p/android/issues/detail?id=40295
(cherry-pick from master)
Change-Id: Ie25d4ab9721d8b69b8d4afcf18e902ef8e3ad911
Jamie Gennis [Mon, 26 Nov 2012 22:12:12 +0000 (14:12 -0800)]
Merge "native_fence_sync: fix an enum name"
Jamie Gennis [Mon, 26 Nov 2012 21:54:56 +0000 (13:54 -0800)]
native_fence_sync: fix an enum name
This change replaces all references to the "EGL_NO_NATIVE_FENCE_ANDROID" enum
with "EGL_NO_NATIVE_FENCE_FD_ANDROID".
Bug: http://code.google.com/p/android/issues/detail?id=40295
Change-Id: I049b2ba185c2dbdccb8fc069701dbe805d63f645
The Android Automerger [Mon, 26 Nov 2012 19:29:02 +0000 (11:29 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Mathias Agopian [Thu, 22 Nov 2012 00:02:13 +0000 (16:02 -0800)]
make transform hint multi-display aware
if a layer is not mirrored, we now use its display
as the source for the transfrom hint calculation
instead of always using the default (main) display.
this change does two thing:
1) we make updateTransformHint take a DisplayDevice
as a parameter instead of hard-coding the
main display.
2) each time we do a transaction that could change
the hint, we go through all layers and
figure out which display should be used for their
transform hint.
Bug:
7599344
Change-Id: I9b04a95e6c372dd770bacf81d8ef6f8e31b87b83
Siva Velusamy [Wed, 21 Nov 2012 04:14:14 +0000 (20:14 -0800)]
am
0e34af62: am
c859084c: am
a9a4cd48: gltrace: Make sure device is debuggable.
* commit '
0e34af6284c258c1dc56670a573ef11a76dda9fe':
gltrace: Make sure device is debuggable.
Siva Velusamy [Wed, 21 Nov 2012 04:01:30 +0000 (20:01 -0800)]
am
c859084c: am
a9a4cd48: gltrace: Make sure device is debuggable.
* commit '
c859084ca303ca1ab69bdc78f864d39c9c81ab0b':
gltrace: Make sure device is debuggable.
Siva Velusamy [Wed, 21 Nov 2012 03:59:23 +0000 (19:59 -0800)]
am
a9a4cd48: gltrace: Make sure device is debuggable.
* commit '
a9a4cd4806ea5b2cf525c8ab4c6604d78c6e3f8f':
gltrace: Make sure device is debuggable.
Siva Velusamy [Tue, 20 Nov 2012 21:39:57 +0000 (13:39 -0800)]
gltrace: Make sure device is debuggable.
(cherry picked from commit
6482fa4db0a7ac99cd3503d6bf170f80b26fb695)
Change-Id: I205aabcab1932025c12e7ba3d1b3cf94684f6758
Siva Velusamy [Tue, 20 Nov 2012 23:37:51 +0000 (15:37 -0800)]
Merge "gltrace: Make sure device is debuggable."
Siva Velusamy [Tue, 20 Nov 2012 21:39:57 +0000 (13:39 -0800)]
gltrace: Make sure device is debuggable.
Change-Id: Icc22ff823a2f56733b232b927dd1fa494e9e1e81
Jamie Gennis [Tue, 20 Nov 2012 20:20:51 +0000 (12:20 -0800)]
Merge "SurfaceFlinger: refactor frame time tracking"
Mathias Agopian [Tue, 20 Nov 2012 15:16:13 +0000 (07:16 -0800)]
am
b171fe9f: am
594a8773: am
764c197c: fix typo that broke all the builds
* commit '
b171fe9f47f0082dae55d5a08fe9b379cbd8e33c':
fix typo that broke all the builds
Mathias Agopian [Tue, 20 Nov 2012 15:13:12 +0000 (07:13 -0800)]
am
594a8773: am
764c197c: fix typo that broke all the builds
* commit '
594a8773c1ef5632a8eb2ef61a86c319460d4248':
fix typo that broke all the builds
Mathias Agopian [Tue, 20 Nov 2012 00:50:24 +0000 (16:50 -0800)]
fix typo that broke all the builds
cherry pick into master since auto-merger is blocked
Bug:
7584338
Change-Id: Ie7d7c238de1fd224b3b0bae9669a8dcb2f700a79
Jamie Gennis [Fri, 9 Nov 2012 03:23:28 +0000 (19:23 -0800)]
SurfaceFlinger: refactor frame time tracking
This change moves the frame time history tracking code out of Layer and into a
new class called FrameTracker. It also changes the tracking to use signal
timestamps from fences when available for more accurate results.
Change-Id: I323c5f075c58bf86ce363b52af885ad0f6365f2b
Mathias Agopian [Tue, 20 Nov 2012 01:04:44 +0000 (17:04 -0800)]
am
764c197c: fix typo that broke all the builds
* commit '
764c197c6fc2bf10b038c33b320a4e95594d52d8':
fix typo that broke all the builds
The Android Automerger [Tue, 20 Nov 2012 00:50:37 +0000 (16:50 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Mathias Agopian [Tue, 20 Nov 2012 00:50:24 +0000 (16:50 -0800)]
fix typo that broke all the builds
Bug:
7584338
Change-Id: Ieb8c27a544ac583af9aa1e0376e33a673d2d9673
Jamie Gennis [Tue, 20 Nov 2012 00:37:42 +0000 (16:37 -0800)]
Merge "SurfaceFlinger: track the HWC retire fences"
The Android Automerger [Tue, 20 Nov 2012 00:13:13 +0000 (16:13 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Mathias Agopian [Mon, 19 Nov 2012 23:07:33 +0000 (15:07 -0800)]
workaround: don't reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE]
This workaround a HWC HAL issue in Nexus 7, which causes videos and live
wallpapers to animate slowly.
Bug:
7563862
Change-Id: I16ad85317e3e7f47f005e7397357c14186b0a13d
Mathias Agopian [Mon, 19 Nov 2012 23:24:52 +0000 (15:24 -0800)]
am
c763303e: (-s ours) am
92c3a307: am
3e095b25: workaround: don\'t reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE]
* commit '
c763303eca5acf56a6d45157106d6277fb0887ab':
workaround: don't reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE]
Mathias Agopian [Mon, 19 Nov 2012 23:23:36 +0000 (15:23 -0800)]
am
92c3a307: am
3e095b25: workaround: don\'t reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE]
* commit '
92c3a307d3ce3ec7a8808d6a2cbb324c0526ac5b':
workaround: don't reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE]
Mathias Agopian [Mon, 19 Nov 2012 23:22:04 +0000 (15:22 -0800)]
am
3e095b25: workaround: don\'t reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE]
* commit '
3e095b251503d71bea04d6b707e8188cd30034e2':
workaround: don't reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE]
Mathias Agopian [Mon, 19 Nov 2012 23:17:27 +0000 (15:17 -0800)]
am
c208cdd4: am
1d3612f1: am
2a8c49eb: fix an out-of-bounds memory access
* commit '
c208cdd402d767228a34074d589c6368cc656b7d':
fix an out-of-bounds memory access
Mathias Agopian [Mon, 19 Nov 2012 23:14:08 +0000 (15:14 -0800)]
am
1d3612f1: am
2a8c49eb: fix an out-of-bounds memory access
* commit '
1d3612f11cb0a56062059dad4643657750c23aab':
fix an out-of-bounds memory access
Mathias Agopian [Mon, 19 Nov 2012 23:07:33 +0000 (15:07 -0800)]
workaround: don't reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE]
This workaround a HWC HAL issue in Nexus 7, which causes videos and live
wallpapers to animate slowly.
Bug:
7563862
Change-Id: I16ad85317e3e7f47f005e7397357c14186b0a13d
Mathias Agopian [Mon, 19 Nov 2012 22:36:43 +0000 (14:36 -0800)]
am
2a8c49eb: fix an out-of-bounds memory access
* commit '
2a8c49eb5dd51b2e60c9a78bea00870867d91c03':
fix an out-of-bounds memory access
Jamie Gennis [Mon, 12 Nov 2012 00:24:33 +0000 (16:24 -0800)]
SurfaceFlinger: track the HWC retire fences
This change adds functionality to the HWComposer class to track the retire
fences returned by each hwc set call. It adds the HWComposer::getDisplayFence
method to allow other parts of SurfaceFlinger to get a fence that will signal
when the most recent flip takes effect on a display.
Change-Id: I676e0f98440fc58ed70908aa1a1e2ee3e7bf9eb2
The Android Automerger [Fri, 16 Nov 2012 19:29:32 +0000 (11:29 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Mathias Agopian [Fri, 16 Nov 2012 01:19:48 +0000 (17:19 -0800)]
fix an out-of-bounds memory access
in this particular case, this OOB is always harmless
(and that's why it didn't get fixed from MR1), however,
it interfers with valgrind debugging.
Change-Id: Ic977e03287e59c4b124a89146c9023bd0cb540a8
Mathias Agopian [Thu, 15 Nov 2012 01:00:58 +0000 (17:00 -0800)]
am
35d39886: am
f9730c3b: am
ee932d0a: Reset compositionType to HWC_FRAMEBUFFER before calling prepare()
* commit '
35d3988616cc40c0975d82f166c641109b787a58':
Reset compositionType to HWC_FRAMEBUFFER before calling prepare()
Mathias Agopian [Thu, 15 Nov 2012 00:59:03 +0000 (16:59 -0800)]
am
f9730c3b: am
ee932d0a: Reset compositionType to HWC_FRAMEBUFFER before calling prepare()
* commit '
f9730c3b9655c32fc7ea13159ac5ff2f90fda3f1':
Reset compositionType to HWC_FRAMEBUFFER before calling prepare()
Mathias Agopian [Thu, 15 Nov 2012 00:56:35 +0000 (16:56 -0800)]
am
ee932d0a: Reset compositionType to HWC_FRAMEBUFFER before calling prepare()
* commit '
ee932d0ad1a16cc93b4bd9eaf9cb3cc756fb2dfc':
Reset compositionType to HWC_FRAMEBUFFER before calling prepare()
Glenn Kasten [Thu, 15 Nov 2012 00:24:27 +0000 (16:24 -0800)]
Fix build
Change-Id: Ibb398f36a7569af3480e24145da4317bf5b86998
Erik Gilling [Wed, 14 Nov 2012 23:11:21 +0000 (15:11 -0800)]
add asynchronous tracing
Change-Id: I5b8660cd4d2af2ad7c6b2548c9572d3527882d6d
Kenny Root [Wed, 14 Nov 2012 23:42:38 +0000 (15:42 -0800)]
Switch keystore to binder
Change-Id: Ie15781de079e8ecc9616cab9a5e392f5c814d9d8