OSDN Git Service
Andy McFadden [Wed, 12 Sep 2012 00:02:51 +0000 (17:02 -0700)]
am
43601a2d: Reduce failure uncertainty
* commit '
43601a2dc320a271ff8c3765ff61414a07221635':
Reduce failure uncertainty
Andy McFadden [Tue, 11 Sep 2012 22:15:13 +0000 (15:15 -0700)]
Reduce failure uncertainty
This adds a trivial workaround for a one-shot boot time crash, plus
an explicit check and abort for a failure condition that currently
presents as a less obvious failure.
Bug:
7145521,
7147557
Change-Id: I548f6a9caa9f0bd5710aaecea0e1c6c7c8f2f281
Andy McFadden [Tue, 11 Sep 2012 17:04:55 +0000 (10:04 -0700)]
am
b0d1dd36: Reshuffle FramebufferSurface
* commit '
b0d1dd36f104c0b581674adc7f830cbf44b7db06':
Reshuffle FramebufferSurface
Andy McFadden [Mon, 10 Sep 2012 21:08:09 +0000 (14:08 -0700)]
Reshuffle FramebufferSurface
FramebufferSurface no longer speaks directly to the FB HAL. Now
everything goes through HWComposer (which may or may not be
connected to a hardware composer).
Added display index arg to some query methods.
Change-Id: Id3e157d2d4e3555d33afbb703e518b6e92e2d6d5
James Dong [Tue, 11 Sep 2012 00:53:43 +0000 (17:53 -0700)]
am
1fc4f80f: Add stack dump from drmserver process to bugreports
* commit '
1fc4f80fc38f782f128102795481924a97a2d3c5':
Add stack dump from drmserver process to bugreports
James Dong [Mon, 10 Sep 2012 23:08:48 +0000 (16:08 -0700)]
Add stack dump from drmserver process to bugreports
This would be helpful tracking down ANR issues in drmserver
o related-to-bug:
7132419
Change-Id: I7eceaa0c29af26bd0092110be6bddf8f4c063545
Jamie Gennis [Mon, 10 Sep 2012 20:33:19 +0000 (13:33 -0700)]
am
61e04b92: SurfaceTexture: use eglWaitSync
* commit '
61e04b92bdeafc6fca89052d14dab1bd0c384a71':
SurfaceTexture: use eglWaitSync
Jamie Gennis [Mon, 10 Sep 2012 00:48:42 +0000 (17:48 -0700)]
SurfaceTexture: use eglWaitSync
This change adds a compile-option to use eglWaitSyncANDROID to ensure that
texturing operations that access the current buffer of a SurfaceTexture do not
occur until the buffer is completely written. It also moves this
synchronization into a new SurfaceTexture method called doGLFenceWait and
changes SurfaceFlinger's Layer class to use that method rather than performing
its own wait on the fence.
Change-Id: I70afa88086ca7ff49a80e3cd03d423767db7cb88
Jamie Gennis [Mon, 10 Sep 2012 19:13:33 +0000 (12:13 -0700)]
am
010dd4fb: EGL: Add the EGL_ANDROID_wait_sync extension
* commit '
010dd4fb892aecf71e4631c22148fe57ef5b3958':
EGL: Add the EGL_ANDROID_wait_sync extension
Jamie Gennis [Mon, 10 Sep 2012 00:46:17 +0000 (17:46 -0700)]
EGL: Add the EGL_ANDROID_wait_sync extension
Change-Id: Ie9a78e07fcaf27c5c13797141ad3c692217607fb
Jamie Gennis [Sun, 9 Sep 2012 20:01:20 +0000 (13:01 -0700)]
am
605f90dc: Merge "SurfaceTexture: use EGL-created native fences" into jb-mr1-dev
* commit '
605f90dc867a18f1ea06203ffa70916f70820f92':
SurfaceTexture: use EGL-created native fences
Jamie Gennis [Sun, 9 Sep 2012 20:00:16 +0000 (13:00 -0700)]
Merge "SurfaceTexture: use EGL-created native fences" into jb-mr1-dev
Jamie Gennis [Thu, 6 Sep 2012 21:54:19 +0000 (14:54 -0700)]
SurfaceTexture: use EGL-created native fences
This change adds support for using Android fences that come from EGLSyncKHR
objects as the release fence for a buffer.
Change-Id: Ice192ce2ec001020f909a2018afdf0f17b24dec9
Jeff Brown [Sun, 9 Sep 2012 07:17:07 +0000 (00:17 -0700)]
am
4c05dd17: Ensure that viewport and frame are initialized.
* commit '
4c05dd175ee3bd5119eecf368742b6510a8cfa6c':
Ensure that viewport and frame are initialized.
Jeff Brown [Sun, 9 Sep 2012 07:07:17 +0000 (00:07 -0700)]
Ensure that viewport and frame are initialized.
onInitializeDisplays() was posting a transaction with changes
to the display projection. Unfortunately, it only set the
display orientation field and left viewport and frame
uninitialized.
The uninitialized values flowed downstream and found themselves
baked into a bogus DisplayDevice mGlobalTransform. That transform
was then applied to some Rects which were turned into Regions
that were them combined with other Regions.
Under certain situations, the uninitialized data might have
a largish value, resulting in the creation of Regions with
components in excess of the Region max-value limit of 0x7ffffff
(note that this is not INT_MAX). Later when performing a
binary operation using the Region, the Spanner would loop
indefinitely trying to figure out how to stuff a humongous
region inside of a max-value region. Not content to try
just once, the Spanner would continue trying again and
again, pegging the CPU and hanging surface flinger during boot.
Insanity soon followed.
Bug:
7130713
Change-Id: I0016f0c9662185be833474c212a1dd408096ae23
Jeff Brown [Fri, 7 Sep 2012 22:01:48 +0000 (15:01 -0700)]
am
4fb3999c: Fix display projection.
* commit '
4fb3999cea652617be5125f8a42c257467bf3c77':
Fix display projection.
Jeff Brown [Fri, 7 Sep 2012 19:55:10 +0000 (12:55 -0700)]
Fix display projection.
Change-Id: I0f253dc3759b99e05ff8344b0f513d8c289702e7
Jamie Gennis [Fri, 7 Sep 2012 01:02:41 +0000 (18:02 -0700)]
am
b2725415: libgui: move fence handling into ConsumerBase
* commit '
b27254154642575dfb4bbfa79fbedde7d7ee23dd':
libgui: move fence handling into ConsumerBase
Jamie Gennis [Thu, 6 Sep 2012 03:09:05 +0000 (20:09 -0700)]
libgui: move fence handling into ConsumerBase
This change moves some common fence handling code into the base class for
BufferQueue consumer classes. It also makes the ConsumerBase class initialize
a buffer slot's fence with the acquire fence every time a buffer is acquired.
Change-Id: I0bd88bc269e919653b659bfb3ebfb04dd61692a0
Jamie Gennis [Thu, 6 Sep 2012 23:14:30 +0000 (16:14 -0700)]
am
331841b9: EGL: add the native_fence_sync extension
* commit '
331841b96b92646c93c87627c03f77b892f711cd':
EGL: add the native_fence_sync extension
Jamie Gennis [Thu, 6 Sep 2012 21:52:00 +0000 (14:52 -0700)]
EGL: add the native_fence_sync extension
This change adds support for the EGL_ANDROID_native_fence_sync extension to the
Android EGL layer. It also fixes a couple minor issues with the extension spec.
Change-Id: Ic8829d21f37b701f33aa9c72c3d25e88e03fa3cd
Jamie Gennis [Thu, 6 Sep 2012 22:00:28 +0000 (15:00 -0700)]
am
8893d5bb: EGL_ANDROID_native_fence_sync: fix the version
* commit '
8893d5bba1191b0dc9db1432868d8dc64de606ad':
EGL_ANDROID_native_fence_sync: fix the version
The Android Open Source Project [Thu, 6 Sep 2012 14:53:49 +0000 (07:53 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I459a44bdaaff7aebadd1db41260960bba3e3a402
The Android Automerger [Thu, 6 Sep 2012 13:34:08 +0000 (06:34 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jamie Gennis [Thu, 6 Sep 2012 02:45:44 +0000 (19:45 -0700)]
EGL_ANDROID_native_fence_sync: fix the version
Change-Id: Ib43b8fec8f37bb847d7bcdbf7607fd56f19a0563
Jesse Hall [Wed, 5 Sep 2012 20:03:10 +0000 (13:03 -0700)]
Always reset layer acquireFenceFd after commit
If SurfaceFlinger needs to refresh the screen but the dirty region is
empty, it won't set the layer acquire fences, and stale file
descriptors will be passed to HWC commit(). Now we make sure to clear
the stale file descriptors for each layer right after commit().
Bug:
7078301
Change-Id: I6953ff91fc5488f105b30b07306f9c45a4c3f780
Mathias Agopian [Wed, 5 Sep 2012 23:00:56 +0000 (16:00 -0700)]
fix a problem where all hwc layers would have the SKIP flags set
the problem was that LayerBase::setPerFrameData() was always setting
this flag. in fact there was no reason to do this at that point since
the layer is initialized to a default state in setGeometry().
Bug:
7111259
Change-Id: Ib37b0dd7391a6163070e9aca025512159c1705f9
Mathias Agopian [Wed, 5 Sep 2012 23:51:06 +0000 (16:51 -0700)]
am
55882dea: fix a problem where all hwc layers would have the SKIP flags set
* commit '
55882dea1b1b305f15192b96ff7814f18babb212':
fix a problem where all hwc layers would have the SKIP flags set
Mathias Agopian [Wed, 5 Sep 2012 23:00:56 +0000 (16:00 -0700)]
fix a problem where all hwc layers would have the SKIP flags set
the problem was that LayerBase::setPerFrameData() was always setting
this flag. in fact there was no reason to do this at that point since
the layer is initialized to a default state in setGeometry().
Bug:
7111259
Change-Id: Ib37b0dd7391a6163070e9aca025512159c1705f9
Jesse Hall [Wed, 5 Sep 2012 20:57:20 +0000 (13:57 -0700)]
am
fe4c745c: Merge "Always reset layer acquireFenceFd after commit" into jb-mr1-dev
* commit '
fe4c745c6d62fb416758cc5aaff3e7decb7ec06b':
Always reset layer acquireFenceFd after commit
Jesse Hall [Wed, 5 Sep 2012 20:54:52 +0000 (13:54 -0700)]
Merge "Always reset layer acquireFenceFd after commit" into jb-mr1-dev
Jamie Gennis [Wed, 5 Sep 2012 20:51:41 +0000 (13:51 -0700)]
am
f42449e1: Merge "EGL_ANDROID_fence_sync: make it more generic" into jb-mr1-dev
* commit '
f42449e1259315d726efa75129bf1c4f5c0150d7':
EGL_ANDROID_fence_sync: make it more generic
Jamie Gennis [Wed, 5 Sep 2012 20:48:50 +0000 (13:48 -0700)]
Merge "EGL_ANDROID_fence_sync: make it more generic" into jb-mr1-dev
Jesse Hall [Wed, 5 Sep 2012 20:03:10 +0000 (13:03 -0700)]
Always reset layer acquireFenceFd after commit
If SurfaceFlinger needs to refresh the screen but the dirty region is
empty, it won't set the layer acquire fences, and stale file
descriptors will be passed to HWC commit(). Now we make sure to clear
the stale file descriptors for each layer right after commit().
Bug:
7078301
Change-Id: I6953ff91fc5488f105b30b07306f9c45a4c3f780
The Android Automerger [Wed, 5 Sep 2012 13:34:02 +0000 (06:34 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Mathias Agopian [Wed, 5 Sep 2012 04:09:34 +0000 (21:09 -0700)]
Mathias Agopian [Wed, 5 Sep 2012 04:04:09 +0000 (21:04 -0700)]
minor cleanup
Change-Id: Ied80e14878e92a506930f7a5a55adde8f260ec70
Mathias Agopian [Wed, 5 Sep 2012 03:30:00 +0000 (20:30 -0700)]
am
762d0114: Merge "display projection API now has a single function instead of 3" into jb-mr1-dev
* commit '
762d0114759686b65feca832a5437e2aee343a13':
display projection API now has a single function instead of 3
Mathias Agopian [Wed, 5 Sep 2012 03:29:59 +0000 (20:29 -0700)]
am
71e83e12: the visibleRegion was never set in hwcomposer
* commit '
71e83e1202dc87afde9c0c31f31c129f3f99263f':
the visibleRegion was never set in hwcomposer
Mathias Agopian [Wed, 5 Sep 2012 03:27:48 +0000 (20:27 -0700)]
Merge "display projection API now has a single function instead of 3" into jb-mr1-dev
Mathias Agopian [Wed, 5 Sep 2012 03:25:39 +0000 (20:25 -0700)]
the visibleRegion was never set in hwcomposer
Bug:
7089478
Change-Id: I13b031b23ce908d33f431a04e1cf87831b551260
Jamie Gennis [Wed, 5 Sep 2012 02:49:51 +0000 (19:49 -0700)]
EGL_ANDROID_fence_sync: make it more generic
This change updates the extension spec to refer to generic "native fence sync
objects" rather than "Android fence sync objects."
Change-Id: I15a79f08571586431845b54c58c8420b652f40ef
Mathias Agopian [Wed, 5 Sep 2012 02:30:46 +0000 (19:30 -0700)]
display projection API now has a single function instead of 3
Change-Id: I9bf46d372b77d547486d4bbe6f1953ec8c65e98f
Mathias Agopian [Wed, 5 Sep 2012 00:04:35 +0000 (17:04 -0700)]
am
da8d0a5c: implement display viewport and frame
* commit '
da8d0a5c0cf9d41915d3b106cad4aaec3e767c11':
implement display viewport and frame
Mathias Agopian [Tue, 4 Sep 2012 22:05:38 +0000 (15:05 -0700)]
implement display viewport and frame
note: viewport clipping is not implemented yet
Change-Id: I7fde7c4de075d409d95c48bb20ba8ee017f6f00a
Jamie Gennis [Tue, 4 Sep 2012 22:00:40 +0000 (15:00 -0700)]
am
493db479: Merge "BufferQueue: add a setMaxAcquiredBufferCount check" into jb-mr1-dev
* commit '
493db47929cdd805339e453062fef265d8985692':
BufferQueue: add a setMaxAcquiredBufferCount check
Jamie Gennis [Tue, 4 Sep 2012 21:58:50 +0000 (14:58 -0700)]
Merge "BufferQueue: add a setMaxAcquiredBufferCount check" into jb-mr1-dev
Jamie Gennis [Tue, 4 Sep 2012 21:57:52 +0000 (14:57 -0700)]
am
e84ec393: Merge "libgui: add BufferQueue test infrastructure" into jb-mr1-dev
* commit '
e84ec393bb48e4817eaa280ee51c099af041b14c':
libgui: add BufferQueue test infrastructure
Jamie Gennis [Tue, 4 Sep 2012 21:56:28 +0000 (14:56 -0700)]
am
374850cf: Merge "libgui: disable CpuConsumer tests" into jb-mr1-dev
* commit '
374850cf161ecacc292afe8e34cbe3f96c0d8e85':
libgui: disable CpuConsumer tests
Fabrice Di Meglio [Tue, 4 Sep 2012 21:56:27 +0000 (14:56 -0700)]
am
13e12578: Merge "Add support for "-rtl" in resources" into jb-mr1-dev
* commit '
13e12578385fdbfa78b19dfa052ffaed4a68234b':
Add support for "-rtl" in resources
Jamie Gennis [Tue, 4 Sep 2012 21:55:58 +0000 (14:55 -0700)]
Merge "libgui: add BufferQueue test infrastructure" into jb-mr1-dev
Jamie Gennis [Tue, 4 Sep 2012 21:55:37 +0000 (14:55 -0700)]
Merge "libgui: disable CpuConsumer tests" into jb-mr1-dev
Fabrice Di Meglio [Tue, 4 Sep 2012 21:55:02 +0000 (14:55 -0700)]
Merge "Add support for "-rtl" in resources" into jb-mr1-dev
Jamie Gennis [Fri, 31 Aug 2012 01:36:22 +0000 (18:36 -0700)]
BufferQueue: add a setMaxAcquiredBufferCount check
This change adds a check to verify the validity of the value passed to
setMaxAcquiredBufferCount.
Change-Id: I39730557aa58261e678bd6e4fce11bab78e98362
Andy McFadden [Tue, 4 Sep 2012 16:40:13 +0000 (09:40 -0700)]
am
6b09f280: Merge "Add timeout when waiting for HW vsync" into jb-mr1-dev
* commit '
6b09f280e522da902ca41b96c3e4510d7a2879b7':
Add timeout when waiting for HW vsync
Andy McFadden [Tue, 4 Sep 2012 16:38:39 +0000 (09:38 -0700)]
Merge "Add timeout when waiting for HW vsync" into jb-mr1-dev
The Android Automerger [Mon, 3 Sep 2012 13:34:05 +0000 (06:34 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Keun young Park [Sat, 1 Sep 2012 03:12:47 +0000 (20:12 -0700)]
am
63f165fd: add libsurfaceflinger_ddmconnection for PDK build
* commit '
63f165fd6b86d04be94d4023e845e98560504a96':
add libsurfaceflinger_ddmconnection for PDK build
Mathias Agopian [Sat, 1 Sep 2012 03:08:47 +0000 (20:08 -0700)]
am
c3973608: the visible region sent to HWC was garbage
* commit '
c39736088398a9b4367b30fc307ed7de96ac342e':
the visible region sent to HWC was garbage
Keun young Park [Fri, 31 Aug 2012 17:53:36 +0000 (10:53 -0700)]
add libsurfaceflinger_ddmconnection for PDK build
- the library is dlopened from libsurfaceflinger
- the library built only when libnativehelper exists
Bug:
7089510
Change-Id: Ib3ea1029d7e8f6e055f4b759d0bf68f5123fa8a1
Mathias Agopian [Sat, 1 Sep 2012 01:45:31 +0000 (18:45 -0700)]
am
50f262fe: minor SharedBuffer clean-up
* commit '
50f262fe569b52bb4d44c96de0d296188ce3885e':
minor SharedBuffer clean-up
Mathias Agopian [Sat, 1 Sep 2012 01:45:30 +0000 (18:45 -0700)]
am
2401ead7: Add a way to retrieve a Region as a SharedBuffer
* commit '
2401ead70099c982796ecc3ec63ec8a5570948fc':
Add a way to retrieve a Region as a SharedBuffer
Mathias Agopian [Sat, 1 Sep 2012 01:45:30 +0000 (18:45 -0700)]
am
3ab68558: change how we store Region data internally
* commit '
3ab68558fa5a4b8f792a54965a010f03385bd271':
change how we store Region data internally
Mathias Agopian [Sat, 1 Sep 2012 01:45:29 +0000 (18:45 -0700)]
am
4c0a1705: don\'t generate a new Region when translating by 0,0
* commit '
4c0a170585d5c8a1f3508ac55f799ebaf86e91db':
don't generate a new Region when translating by 0,0
Mathias Agopian [Sat, 1 Sep 2012 01:45:28 +0000 (18:45 -0700)]
am
2098517e: make sure Parcel handles 0-sized LightFlatenables
* commit '
2098517e3e12a401005d7a7510d6c4943707b98d':
make sure Parcel handles 0-sized LightFlatenables
Mathias Agopian [Sat, 1 Sep 2012 00:51:25 +0000 (17:51 -0700)]
the visible region sent to HWC was garbage
we used to have a visibleRegion object per layer, but now
it's per screen; so at somepoint the code got changed to
calculate the per-screen visible region on the stack and that's
what got passed to HWC.
we're now setting the visibleRegionScreen at each frame and
freeing at after the HWC set() call. We use the underlaying
SharedBuffer so that in most cases we don't have to allocate,
free or copy memory around.
Bug:
7089478
Change-Id: I24fa556c76613a225d9fe7a6c6b727bb476144d8
Mathias Agopian [Fri, 31 Aug 2012 23:20:23 +0000 (16:20 -0700)]
minor SharedBuffer clean-up
Change-Id: If38b7ce85806ae628c00f2c938de4e3f75142543
Mathias Agopian [Fri, 31 Aug 2012 22:41:24 +0000 (15:41 -0700)]
Add a way to retrieve a Region as a SharedBuffer
Change-Id: Ia53cb905fbc88f899521658545f990fb9217b1e1
Mathias Agopian [Fri, 31 Aug 2012 21:31:40 +0000 (14:31 -0700)]
change how we store Region data internally
We used to keep the bounds of the region as a
separate rectangle. Instead we now store it as the last
element of the Vector<> of Rects.
This has the benefit of being slightly more efficient when
copying regions and reduces the overhead of small regions,
but more importantly will allow us to export the underlaying
SharedBuffer (eventually).
Change-Id: I80790e4fb1a09a747a5616000cfef852ac4ce9e9
Mathias Agopian [Fri, 31 Aug 2012 19:45:33 +0000 (12:45 -0700)]
don't generate a new Region when translating by 0,0
since regions are copy-on-write, this prevents to
duplicate the region entirely and offseting by 0,0 is
fairly common.
Change-Id: I9b8c286315a2e00dda01c2456397d72b5e12006b
Mathias Agopian [Fri, 31 Aug 2012 21:25:22 +0000 (14:25 -0700)]
make sure Parcel handles 0-sized LightFlatenables
Change-Id: Ib30a1c0228f8a938abaa0c7c8a6ba32ffd971121
Jamie Gennis [Fri, 31 Aug 2012 22:32:45 +0000 (15:32 -0700)]
libgui: add BufferQueue test infrastructure
This change adds some infrastructure for testing the BufferQueue class. It
also includes a test that tests the new check in BufferQueue::acquireBuffer
that prevents the consumer from acquiring more than one buffer beyond the max
acquired buffer count that was set.
Change-Id: I38554ad3f9a53d2ddeba7ef0deee35ec2e2f9775
Andy McFadden [Thu, 30 Aug 2012 23:34:41 +0000 (16:34 -0700)]
Add timeout when waiting for HW vsync
This way we don't get stuck if, say, the driver decides not
to send us vsync events.
Change-Id: I4af6358b3a1f304eaae5fd926ed3403fa1091827
Dianne Hackborn [Fri, 31 Aug 2012 23:27:40 +0000 (16:27 -0700)]
am
8210185f: No longer need "original calling uid".
* commit '
8210185fe337ca9d5b01f2bff8590ea60984c31e':
No longer need "original calling uid".
Jamie Gennis [Fri, 31 Aug 2012 21:44:50 +0000 (14:44 -0700)]
libgui: disable CpuConsumer tests
This change disables the CpuConsumer tests because they require a Gralloc
format that is not supported on all devices.
Change-Id: Ifaa618062c1dae53d9fcb9e16ba92c480d3dbd0c
Dianne Hackborn [Fri, 31 Aug 2012 21:15:50 +0000 (14:15 -0700)]
No longer need "original calling uid".
Change-Id: Ifc4a89dd088609a5a8553f6ac6553174e09e8222
Jesse Hall [Fri, 31 Aug 2012 20:54:08 +0000 (13:54 -0700)]
am
9ca48916: If there is no hwc, call eglSwapBuffers for the main display
* commit '
9ca48916bc9408d0f3f8ac95469ced0a6a342aca':
If there is no hwc, call eglSwapBuffers for the main display
Jesse Hall [Thu, 30 Aug 2012 20:42:23 +0000 (13:42 -0700)]
If there is no hwc, call eglSwapBuffers for the main display
Bug:
7068568
Change-Id: I6a0309613fe3619d065b9047af6c3fb32b510d97
Jesse Hall [Fri, 31 Aug 2012 19:58:56 +0000 (12:58 -0700)]
am
f90883d6: Merge "HWC 1.1: hook up hotplug event, use new display config queries" into jb-mr1-dev
* commit '
f90883d6a50688081642855bba43bef0693d5020':
HWC 1.1: hook up hotplug event, use new display config queries
Jamie Gennis [Fri, 31 Aug 2012 19:57:30 +0000 (12:57 -0700)]
am
4697528e: SurfaceTexture: fix a few tests
* commit '
4697528eac85d34b2b375ece1d4b40aebe3fa5dd':
SurfaceTexture: fix a few tests
Jamie Gennis [Fri, 31 Aug 2012 19:57:30 +0000 (12:57 -0700)]
am
d69097f9: libgui: add some error checks
* commit '
d69097f936d9780957a51ce77335ae409b32aaa3':
libgui: add some error checks
Jamie Gennis [Fri, 31 Aug 2012 19:57:29 +0000 (12:57 -0700)]
am
5e5efde7: BufferQueue: add a check for the max acquired bufs
* commit '
5e5efde7874a9fab650fd4b724ceef46db850470':
BufferQueue: add a check for the max acquired bufs
Jesse Hall [Fri, 31 Aug 2012 19:57:06 +0000 (12:57 -0700)]
Merge "HWC 1.1: hook up hotplug event, use new display config queries" into jb-mr1-dev
Jesse Hall [Wed, 29 Aug 2012 17:47:52 +0000 (10:47 -0700)]
HWC 1.1: hook up hotplug event, use new display config queries
Change-Id: I2fd359e5fc7e1948072c6bc6b6fe47ea5e8025c1
Jamie Gennis [Fri, 31 Aug 2012 01:35:50 +0000 (18:35 -0700)]
SurfaceTexture: fix a few tests
Change-Id: Ic74fe8791361f8fe91ad7149720fafd4cc154ac1
Jamie Gennis [Thu, 30 Aug 2012 20:28:23 +0000 (13:28 -0700)]
libgui: add some error checks
This change adds a few error checks both in the framework and in some tests.
Change-Id: I2baf2676942a0dc15866e75852a775a0091ed16d
Jamie Gennis [Wed, 29 Aug 2012 00:18:50 +0000 (17:18 -0700)]
BufferQueue: add a check for the max acquired bufs
This change adds an error check to ensure that consumers don't acquire more
buffers than the maximum that they set.
Change-Id: I026643564bde52732e4ee6146972b207ddbbba77
Jamie Gennis [Fri, 31 Aug 2012 01:28:31 +0000 (18:28 -0700)]
am
72f096fb: BufferQueue: use max acquired buffer count
* commit '
72f096fb1ad0a0deadbfac5f88627461905d38e8':
BufferQueue: use max acquired buffer count
Jamie Gennis [Tue, 28 Aug 2012 01:48:37 +0000 (18:48 -0700)]
BufferQueue: use max acquired buffer count
This change makes BufferQueue derive the min undequeued buffer count from a max
acquired buffer count that is set by the consumer. This value may be set at
any time that a producer is not connected to the BufferQueue rather than at
BufferQueue construction time.
Change-Id: Icf9f1d91ec612a079968ba0a4621deffe48f4e22
Jamie Gennis [Fri, 31 Aug 2012 01:24:37 +0000 (18:24 -0700)]
am
1847f7fd: Merge "BufferQueue: simplify max buffer count handling" into jb-mr1-dev
* commit '
1847f7fd799f92300b3786e49f5883eaa03f4507':
BufferQueue: simplify max buffer count handling
Jamie Gennis [Fri, 31 Aug 2012 01:23:26 +0000 (18:23 -0700)]
Merge "BufferQueue: simplify max buffer count handling" into jb-mr1-dev
Jamie Gennis [Fri, 31 Aug 2012 01:23:14 +0000 (18:23 -0700)]
am
2b977698: Merge "BufferQueue: clean up buffer counting" into jb-mr1-dev
* commit '
2b9776982360a234803665cb79e8abcfeb0e3c79':
BufferQueue: clean up buffer counting
Jamie Gennis [Fri, 31 Aug 2012 01:21:10 +0000 (18:21 -0700)]
Merge "BufferQueue: clean up buffer counting" into jb-mr1-dev
Wink Saville [Fri, 31 Aug 2012 00:34:11 +0000 (17:34 -0700)]
am
f196b56d: Merge "Revert "A vendor ril depends on a native screen shot code."" into jb-mr1-dev
* commit '
f196b56d70df6af753cb08bbb68e52498f0f37f1':
Revert "A vendor ril depends on a native screen shot code."
Wink Saville [Fri, 31 Aug 2012 00:31:47 +0000 (17:31 -0700)]
Merge "Revert "A vendor ril depends on a native screen shot code."" into jb-mr1-dev
Jesse Hall [Thu, 30 Aug 2012 21:27:03 +0000 (14:27 -0700)]
am
ec34af41: Merge "Handle new device api version encoding" into jb-mr1-dev
* commit '
ec34af4144c0f990513fe58b0754b20f94b36d6f':
Handle new device api version encoding
Jesse Hall [Thu, 30 Aug 2012 21:24:52 +0000 (14:24 -0700)]
Merge "Handle new device api version encoding" into jb-mr1-dev
Wink Saville [Thu, 30 Aug 2012 18:53:55 +0000 (11:53 -0700)]
Revert "A vendor ril depends on a native screen shot code."
This reverts commit
9b5782baf0a8a2d7afc7129453beb5df7abe7650.
A new ril for toro, hack no longer needed.
The Android Automerger [Thu, 30 Aug 2012 13:34:01 +0000 (06:34 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Mathias Agopian [Thu, 30 Aug 2012 01:24:58 +0000 (18:24 -0700)]
am
93997a8a: fix a crasher when setting a display to a null surface
* commit '
93997a8a75942b4d06cf50925de5bede489cc134':
fix a crasher when setting a display to a null surface