OSDN Git Service
Jesse Hall [Wed, 5 Sep 2012 20:59:38 +0000 (13:59 -0700)]
am
bc17bc32: am
fe4c745c: Merge "Always reset layer acquireFenceFd after commit" into jb-mr1-dev
* commit '
bc17bc327b56be32887d49eb291f29fd5f1570ac':
Always reset layer acquireFenceFd after commit
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:54:13 +0000 (13:54 -0700)]
am
6d53451b: am
f42449e1: Merge "EGL_ANDROID_fence_sync: make it more generic" into jb-mr1-dev
* commit '
6d53451b038591c57c0743ef4b5649d4e9240c45':
EGL_ANDROID_fence_sync: make it more generic
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
Mathias Agopian [Wed, 5 Sep 2012 04:12:05 +0000 (21:12 -0700)]
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:31:44 +0000 (20:31 -0700)]
am
f9a65e17: am
762d0114: Merge "display projection API now has a single function instead of 3" into jb-mr1-dev
* commit '
f9a65e176bc876666004e41cee81c4159b03bea4':
display projection API now has a single function instead of 3
Mathias Agopian [Wed, 5 Sep 2012 03:31:43 +0000 (20:31 -0700)]
am
3266cdac: am
71e83e12: the visibleRegion was never set in hwcomposer
* commit '
3266cdac8a182e38f024a022d5cb917a5059cddb':
the visibleRegion was never set in hwcomposer
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:07:10 +0000 (17:07 -0700)]
am
84eda044: am
da8d0a5c: implement display viewport and frame
* commit '
84eda0448a608b0ab299226168b320374f6074b1':
implement display viewport and frame
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:02:48 +0000 (15:02 -0700)]
am
e4f7d56e: am
493db479: Merge "BufferQueue: add a setMaxAcquiredBufferCount check" into jb-mr1-dev
* commit '
e4f7d56ef152948e97e1869d8d367f237584c07d':
BufferQueue: add a setMaxAcquiredBufferCount check
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:56 +0000 (14:58 -0700)]
am
c802e131: am
e84ec393: Merge "libgui: add BufferQueue test infrastructure" into jb-mr1-dev
* commit '
c802e131b54903e6acc3b4e88e5be3c541bcbc21':
libgui: add BufferQueue test infrastructure
Jamie Gennis [Tue, 4 Sep 2012 21:58:55 +0000 (14:58 -0700)]
am
d99bfe42: am
374850cf: Merge "libgui: disable CpuConsumer tests" into jb-mr1-dev
* commit '
d99bfe4212474b9e3f7a18b84250c3e93474301a':
libgui: disable CpuConsumer tests
Fabrice Di Meglio [Tue, 4 Sep 2012 21:58:54 +0000 (14:58 -0700)]
am
31ce13d7: am
13e12578: Merge "Add support for "-rtl" in resources" into jb-mr1-dev
* commit '
31ce13d721a0cf45bd50f80b09b8460dcd9b38b6':
Add support for "-rtl" in resources
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:42:25 +0000 (09:42 -0700)]
am
50ba6b73: am
6b09f280: Merge "Add timeout when waiting for HW vsync" into jb-mr1-dev
* commit '
50ba6b73045693f25b65694ef2a8b3fc14064081':
Add timeout when waiting for HW vsync
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
Keun young Park [Sat, 1 Sep 2012 03:15:40 +0000 (20:15 -0700)]
am
7beee7f3: am
63f165fd: add libsurfaceflinger_ddmconnection for PDK build
* commit '
7beee7f35a88926704c793eb0e7343144431f760':
add libsurfaceflinger_ddmconnection for PDK build
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:11:39 +0000 (20:11 -0700)]
am
caf2d848: am
c3973608: the visible region sent to HWC was garbage
* commit '
caf2d848140a3747c0c49882ae5655b5c15a7e0a':
the visible region sent to HWC was garbage
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:47:47 +0000 (18:47 -0700)]
am
04696058: am
50f262fe: minor SharedBuffer clean-up
* commit '
046960580519d055db166445b2d005474d123600':
minor SharedBuffer clean-up
Mathias Agopian [Sat, 1 Sep 2012 01:47:46 +0000 (18:47 -0700)]
am
1251754a: am
2401ead7: Add a way to retrieve a Region as a SharedBuffer
* commit '
1251754a1f233dba06bf845daf86e2b5ff211035':
Add a way to retrieve a Region as a SharedBuffer
Mathias Agopian [Sat, 1 Sep 2012 01:47:45 +0000 (18:47 -0700)]
am
a62b0f63: am
3ab68558: change how we store Region data internally
* commit '
a62b0f63e6ef733e3665bc1abe6c4aab6c0c57d8':
change how we store Region data internally
Mathias Agopian [Sat, 1 Sep 2012 01:47:45 +0000 (18:47 -0700)]
am
5f86fd29: am
4c0a1705: don\'t generate a new Region when translating by 0,0
* commit '
5f86fd299ba2d1be923d3397986e8fd2dd3a1cff':
don't generate a new Region when translating by 0,0
Mathias Agopian [Sat, 1 Sep 2012 01:47:44 +0000 (18:47 -0700)]
am
df0adbbb: am
2098517e: make sure Parcel handles 0-sized LightFlatenables
* commit '
df0adbbb60b9facf1a135f0c3c5705392d1dd7bb':
make sure Parcel handles 0-sized LightFlatenables
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:30:16 +0000 (16:30 -0700)]
am
a2de8585: am
8210185f: No longer need "original calling uid".
* commit '
a2de8585e8b74a1711c4b47c20e3a76f04f6ed40':
No longer need "original calling uid".
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:56:40 +0000 (13:56 -0700)]
am
8fc56006: am
9ca48916: If there is no hwc, call eglSwapBuffers for the main display
* commit '
8fc56006b680522ce4fadfeaf5435a8338027307':
If there is no hwc, call eglSwapBuffers for the main display
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 20:01:24 +0000 (13:01 -0700)]
am
5909d99e: am
f90883d6: Merge "HWC 1.1: hook up hotplug event, use new display config queries" into jb-mr1-dev
* commit '
5909d99e1d62c7b650f28481b6839ed1b6c5bf51':
HWC 1.1: hook up hotplug event, use new display config queries
Jamie Gennis [Fri, 31 Aug 2012 19:59:58 +0000 (12:59 -0700)]
am
023881e2: am
4697528e: SurfaceTexture: fix a few tests
* commit '
023881e28d22a3e9b89c1b3287255d23681c940d':
SurfaceTexture: fix a few tests
Jamie Gennis [Fri, 31 Aug 2012 19:59:57 +0000 (12:59 -0700)]
am
b6d226ef: am
d69097f9: libgui: add some error checks
* commit '
b6d226ef4a3d190bf08f34228d8eaba95fa3de91':
libgui: add some error checks
Jamie Gennis [Fri, 31 Aug 2012 19:59:55 +0000 (12:59 -0700)]
am
d7c862b3: am
5e5efde7: BufferQueue: add a check for the max acquired bufs
* commit '
d7c862b3718a985dd83e0d3c7b68f6fa5a701734':
BufferQueue: add a check for the max acquired bufs
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:31:29 +0000 (18:31 -0700)]
am
4d4ebc47: am
72f096fb: BufferQueue: use max acquired buffer count
* commit '
4d4ebc4788cc69a75da48df267ba9052540882d7':
BufferQueue: use max acquired buffer count
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 [Fri, 31 Aug 2012 01:26:38 +0000 (18:26 -0700)]
am
c02ee026: am
1847f7fd: Merge "BufferQueue: simplify max buffer count handling" into jb-mr1-dev
* commit '
c02ee026044f1fa3ce6a78bcdb8d6e24997a806d':
BufferQueue: simplify max buffer count handling
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:25:15 +0000 (18:25 -0700)]
am
f4d82f7d: am
2b977698: Merge "BufferQueue: clean up buffer counting" into jb-mr1-dev
* commit '
f4d82f7d52dd108bd3becb5c1404228d47bbf7ef':
BufferQueue: clean up buffer counting
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:35:48 +0000 (17:35 -0700)]
am
fdddb7b0: am
f196b56d: Merge "Revert "A vendor ril depends on a native screen shot code."" into jb-mr1-dev
* commit '
fdddb7b0fdc80dff5aa2962178e437b29acdcb79':
Revert "A vendor ril depends on a native screen shot code."
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:29:25 +0000 (14:29 -0700)]
am
066b3d39: am
ec34af41: Merge "Handle new device api version encoding" into jb-mr1-dev
* commit '
066b3d39a8ba7be8317b7e0f2652934d80368b1f':
Handle new device api version encoding
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.
Mathias Agopian [Thu, 30 Aug 2012 01:26:26 +0000 (18:26 -0700)]
am
344d189c: am
93997a8a: fix a crasher when setting a display to a null surface
* commit '
344d189cee2e6c5487fb59502777eb33a3bdd22a':
fix a crasher when setting a display to a null surface
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
Mathias Agopian [Thu, 30 Aug 2012 00:30:36 +0000 (17:30 -0700)]
fix a crasher when setting a display to a null surface
Bug:
7076303
Change-Id: I843dd4ee4a603b8ad51bc1ad14e429db15050bec
Mathias Agopian [Thu, 30 Aug 2012 00:29:35 +0000 (17:29 -0700)]
am
3fc6a2ce: am
c9ea4c8b: Merge "we were sometimes not setting fences properly" into jb-mr1-dev
* commit '
3fc6a2cebc8ea8c71ec9b673b6730d708acc5af7':
we were sometimes not setting fences properly