OSDN Git Service
Jeff Sharkey [Wed, 6 Mar 2013 01:57:26 +0000 (17:57 -0800)]
Return NO_MEMORY when glReadPixels() fails.
Change-Id: Ic66134ef457e8442ae9135e9ec50e3d02932a253
The Android Automerger [Wed, 6 Mar 2013 15:49:58 +0000 (07:49 -0800)]
merge in master-release history after reset to master
Glenn Kasten [Tue, 5 Mar 2013 23:37:49 +0000 (23:37 +0000)]
Merge "Continue removing property debug.sys.noschedgroups"
Igor Murashkin [Tue, 5 Mar 2013 22:00:27 +0000 (22:00 +0000)]
am
501ca36a: am
f082323c: Merge "CpuConsumer_test: Extend test with new formats RGBA8888 and optional Y8/Y16" into jb-mr2-dev
* commit '
501ca36a45e83b6fdddefd1cb365757003a713cd':
CpuConsumer_test: Extend test with new formats RGBA8888 and optional Y8/Y16
Igor Murashkin [Tue, 5 Mar 2013 21:59:03 +0000 (21:59 +0000)]
am
f082323c: Merge "CpuConsumer_test: Extend test with new formats RGBA8888 and optional Y8/Y16" into jb-mr2-dev
* commit '
f082323c0dbd915d2ad7b6f4d9c732e230fcda46':
CpuConsumer_test: Extend test with new formats RGBA8888 and optional Y8/Y16
Igor Murashkin [Tue, 5 Mar 2013 21:58:00 +0000 (21:58 +0000)]
Merge "CpuConsumer_test: Extend test with new formats RGBA8888 and optional Y8/Y16" into jb-mr2-dev
Igor Murashkin [Wed, 6 Feb 2013 01:54:32 +0000 (17:54 -0800)]
CpuConsumer_test: Extend test with new formats RGBA8888 and optional Y8/Y16
Change-Id: I0a0f6ce73516883bf50c749a1759abbdb3748e08
Andy McFadden [Tue, 5 Mar 2013 21:14:04 +0000 (21:14 +0000)]
am
9d549c28: am
7284145d: Add eglPresentationTimeANDROID
* commit '
9d549c2844af1bad303317687b07da6ccf493b01':
Add eglPresentationTimeANDROID
Andy McFadden [Tue, 5 Mar 2013 21:05:36 +0000 (21:05 +0000)]
am
7284145d: Add eglPresentationTimeANDROID
* commit '
7284145d564fa8a422a8e564a38c730fb4a2962b':
Add eglPresentationTimeANDROID
Andy McFadden [Sat, 2 Mar 2013 00:25:32 +0000 (16:25 -0800)]
Add eglPresentationTimeANDROID
Added EGL extension to set a timestamp on a surface.
Also, fix JNI encoding of "long" in glgen.
Bug
8191230
Change-Id: I38b7334bade3f8ff02bffe600bb74469ef22c164
The Android Open Source Project [Tue, 5 Mar 2013 15:58:53 +0000 (15:58 +0000)]
am
3c078da2: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
3c078da2f2326ffbed87fc99ba4842d0e8aee6e4':
The Android Open Source Project [Tue, 5 Mar 2013 15:53:32 +0000 (07:53 -0800)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I7bb6b77ca42a715a6eb69081512c43a43158e1e3
The Android Automerger [Tue, 5 Mar 2013 15:49:50 +0000 (07:49 -0800)]
merge in master-release history after reset to master
The Android Automerger [Tue, 5 Mar 2013 13:55:39 +0000 (05:55 -0800)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Mathias Agopian [Tue, 5 Mar 2013 02:34:16 +0000 (02:34 +0000)]
am
67542791: am
306f18c5: Merge "rework screenshot API and implementation" into jb-mr2-dev
* commit '
675427910b939e8b32545aa857e96c4066e3b525':
rework screenshot API and implementation
Mathias Agopian [Tue, 5 Mar 2013 02:31:41 +0000 (02:31 +0000)]
am
306f18c5: Merge "rework screenshot API and implementation" into jb-mr2-dev
* commit '
306f18c5fb15ac05db09ece7241af02b9713a23d':
rework screenshot API and implementation
Mathias Agopian [Tue, 5 Mar 2013 02:30:13 +0000 (02:30 +0000)]
Merge "rework screenshot API and implementation" into jb-mr2-dev
Jesse Hall [Tue, 5 Mar 2013 01:12:04 +0000 (01:12 +0000)]
am
6fbc098c: am
eabe3140: Merge "Init displays to null layer stack" into jb-mr2-dev
* commit '
6fbc098cfd730fb6dac3620caa720d8f4e620af0':
Init displays to null layer stack
Jesse Hall [Tue, 5 Mar 2013 01:09:27 +0000 (01:09 +0000)]
am
eabe3140: Merge "Init displays to null layer stack" into jb-mr2-dev
* commit '
eabe3140f11e515639e7a70a1286dd6af7352c9e':
Init displays to null layer stack
Jesse Hall [Tue, 5 Mar 2013 01:04:53 +0000 (01:04 +0000)]
Merge "Init displays to null layer stack" into jb-mr2-dev
Mathias Agopian [Mon, 4 Mar 2013 22:14:52 +0000 (22:14 +0000)]
am
88138291: am
f59d2f90: Merge changes I0e90b3f3,Ib7769bde,I4c25f34f,I1ec6400a into jb-mr2-dev
* commit '
88138291611a2357fe0a2ee8cc32f17b2cd6e1be':
implement display projection clipping in h/w composer
refactor the crop region for hwc is calculated/set
apply the projection's viewport to the visibleregion passed to hwc
set correct crop rectangle in LayerBase::setCrop
Mathias Agopian [Mon, 4 Mar 2013 22:13:30 +0000 (22:13 +0000)]
am
f59d2f90: Merge changes I0e90b3f3,Ib7769bde,I4c25f34f,I1ec6400a into jb-mr2-dev
* commit '
f59d2f9070621e8f36b2ded3ec1d07bd3aec6150':
implement display projection clipping in h/w composer
refactor the crop region for hwc is calculated/set
apply the projection's viewport to the visibleregion passed to hwc
set correct crop rectangle in LayerBase::setCrop
Mathias Agopian [Mon, 4 Mar 2013 22:12:23 +0000 (22:12 +0000)]
Merge changes I0e90b3f3,Ib7769bde,I4c25f34f,I1ec6400a into jb-mr2-dev
* changes:
implement display projection clipping in h/w composer
refactor the crop region for hwc is calculated/set
apply the projection's viewport to the visibleregion passed to hwc
set correct crop rectangle in LayerBase::setCrop
Jesse Hall [Mon, 4 Mar 2013 21:52:24 +0000 (21:52 +0000)]
am
54a1faa7: am
006a601f: Fix reading NULL Surfaces from Parcels
* commit '
54a1faa7ca910b59b85e6afe969fde5d9a73a56f':
Fix reading NULL Surfaces from Parcels
Jesse Hall [Mon, 4 Mar 2013 21:50:23 +0000 (21:50 +0000)]
am
006a601f: Fix reading NULL Surfaces from Parcels
* commit '
006a601f22b275bcabf608f630b321df027d56d1':
Fix reading NULL Surfaces from Parcels
The Android Open Source Project [Mon, 4 Mar 2013 19:10:09 +0000 (19:10 +0000)]
am
a3b948e7: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
a3b948e727a38582b88f1d3c7b604c0e3712f04f':
Revert "Change SurfaceControl setPosition to take floats"
SurfaceFlinger: fix a couple NULL fence checks
The Android Open Source Project [Mon, 4 Mar 2013 19:06:47 +0000 (11:06 -0800)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I8176eb9302e58477ef1bd9b394a974d85fa67792
The Android Automerger [Mon, 4 Mar 2013 15:49:49 +0000 (07:49 -0800)]
merge in master-release history after reset to master
The Android Automerger [Mon, 4 Mar 2013 13:55:48 +0000 (05:55 -0800)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Jesse Hall [Sun, 3 Mar 2013 00:25:32 +0000 (16:25 -0800)]
Fix reading NULL Surfaces from Parcels
Writing a NULL Surface was being read as a non-NULL Surface with NULL
mGraphicBufferProducer. Before the SurfaceTextureClient -> Surface
refactoring, you'd get a NULL Surface, and some code relies on that.
Bug:
8291161
Change-Id: I477bfe8882693e53a5f604a3d2c9e3cfe24473b4
Mathias Agopian [Fri, 1 Mar 2013 21:42:57 +0000 (13:42 -0800)]
rework screenshot API and implementation
- SurfaceFlinger now supports to take a screenshot
directly into an IGraphicBufferProducer
- reimplement the IMemoryHeap screenshot on top
of the above
- reimplement LayerScreenshot such that its
BufferQueue is directly used as the destination
of the screenshot. LayerScreenshot is now a thin
wrapper around Layer
Bug:
6940974
Change-Id: I69a2096b44b91acbb99eba16f83a9c78d94e0d10
Dave Burke [Sat, 2 Mar 2013 00:15:59 +0000 (00:15 +0000)]
am
bbb57f33: Revert "Change SurfaceControl setPosition to take floats"
* commit '
bbb57f3331c7182399ed82e9c4f93a965677dde3':
Revert "Change SurfaceControl setPosition to take floats"
Dave Burke [Fri, 1 Mar 2013 20:39:03 +0000 (20:39 +0000)]
Revert "Change SurfaceControl setPosition to take floats"
Temporary, to fix weekend build, until we get Nvidia code drop.
This reverts commit
9a867a8798fa6ea21f6341db31e38ea64fde6c83
DO NOT MERGE
Change-Id: I7b5dbc4db46ef3d97dc8598057d5487d6971178b
Dave Burke [Fri, 1 Mar 2013 20:39:03 +0000 (20:39 +0000)]
Revert "Change SurfaceControl setPosition to take floats"
Temporary, to fix weekend build, until we get Nvidia code drop.
This reverts commit
9a867a8798fa6ea21f6341db31e38ea64fde6c83
DO NOT MERGE
Change-Id: I7b5dbc4db46ef3d97dc8598057d5487d6971178b
Guang Zhu [Fri, 1 Mar 2013 23:59:33 +0000 (23:59 +0000)]
Merge "Revert "Change SurfaceControl setPosition to take floats""
Dave Burke [Fri, 1 Mar 2013 20:39:03 +0000 (20:39 +0000)]
Revert "Change SurfaceControl setPosition to take floats"
Temporary, to fix weekend build, until we get Nvidia code drop.
This reverts commit
9a867a8798fa6ea21f6341db31e38ea64fde6c83
Change-Id: I7b5dbc4db46ef3d97dc8598057d5487d6971178b
Nick Kralevich [Fri, 1 Mar 2013 18:12:05 +0000 (18:12 +0000)]
am
98ca63e6: am
22641851: Merge "dumpstate: use correct header file."
* commit '
98ca63e6d15e47a9b62971f0db6424c13c226019':
dumpstate: use correct header file.
Nick Kralevich [Fri, 1 Mar 2013 18:05:56 +0000 (18:05 +0000)]
am
22641851: Merge "dumpstate: use correct header file."
* commit '
22641851c48fee6e79d01adcfab01c0b625cfb3c':
dumpstate: use correct header file.
Nick Kralevich [Fri, 1 Mar 2013 17:49:47 +0000 (17:49 +0000)]
am
5ec3e781: Merge "installd: use correct header file." into jb-mr2-dev
* commit '
5ec3e781c540d660a921a48575e241ae6839a26f':
installd: use correct header file.
Nick Kralevich [Fri, 1 Mar 2013 17:42:32 +0000 (17:42 +0000)]
Merge "installd: use correct header file." into jb-mr2-dev
Nick Kralevich [Fri, 1 Mar 2013 16:39:57 +0000 (16:39 +0000)]
Merge "dumpstate: use correct header file."
The Android Automerger [Fri, 1 Mar 2013 15:50:14 +0000 (07:50 -0800)]
merge in master-release history after reset to master
Jesse Hall [Wed, 20 Feb 2013 00:13:35 +0000 (16:13 -0800)]
Init displays to null layer stack
When a display is added, initialize it to use an empty layer stack, so
if it is somehow visible it will show black. It will be assigned the
real layer stack -- along with a projection and other properties -- by
window manager soon. Normally a display remains blanked until window
manager has decided what to show on it, but for HDMI connected at boot
that isn't currently the case.
Bug:
7258935
Change-Id: Ic9bb25f7a9b8d9d3772b097ab1d6fa03bc8780a1
Mathias Agopian [Fri, 1 Mar 2013 01:12:07 +0000 (17:12 -0800)]
implement display projection clipping in h/w composer
- cropping to the projection's "viewport" is "simply"
accomplished by intersecting it with the window crop
expressed in layerstack space.
Bug:
7149437
Change-Id: I0e90b3f37945292314b5d78a8f134935967e8053
Mathias Agopian [Thu, 28 Feb 2013 06:03:19 +0000 (22:03 -0800)]
refactor the crop region for hwc is calculated/set
- the crop region is now always calculated and set
in LayerBase::setGeometry which uses new virtuals to
access the "content" crop and transform (which are
provided by the Layer subclass)
Change-Id: Ib7769bdec0917dd248f926600c14ddf9ea84897a
Mathias Agopian [Wed, 27 Feb 2013 00:54:05 +0000 (16:54 -0800)]
apply the projection's viewport to the visibleregion passed to hwc
each desplay's projection's viewport essentially clips each layer,
so this should be reflected in the visibleregion passed to
h/w composer.
DisplayDevice getViewport and getFrame are now guaranteed to return
valid Rects.
Change-Id: I4c25f34fb26af10179eb26d429ca6c384c671e91
Mathias Agopian [Wed, 27 Feb 2013 00:37:53 +0000 (16:37 -0800)]
set correct crop rectangle in LayerBase::setCrop
The crop always had left=top=0, because the crop position
and the layer's transform were merged together in
computeBounds() (which really used to compute the
bounds in screen space, which we usually call the
"frame" elsewhere in the code)
Note: in practice this crop value is not used by
hwc, because it's overridden in Layer::setGeometry(), which
is why this bug was never apparent.
Change-Id: I1ec6400a8fc8314408e4252708f43ea98c2fe64e
Eino-Ville Talvala [Fri, 1 Mar 2013 01:53:30 +0000 (01:53 +0000)]
am
eb0d1296: CpuConsumer: Add optional asynchronous mode
* commit '
eb0d12963d271052c24abb025d698504df9e7573':
CpuConsumer: Add optional asynchronous mode
Eino-Ville Talvala [Fri, 1 Mar 2013 01:53:30 +0000 (01:53 +0000)]
am
64d8b190: CpuConsumer: Don\'t unlock buffers on producer disconnect
* commit '
64d8b1903e4b5f2838818eedcf4fef748b38709c':
CpuConsumer: Don't unlock buffers on producer disconnect
Nick Kralevich [Fri, 1 Mar 2013 00:59:13 +0000 (16:59 -0800)]
installd: use correct header file.
This is a port of https://android-review.googlesource.com/52540 ,
which doesn't apply cleanly to master.
Change-Id: I2824bb7afd4e343b5dc8bed9f24002ec1dcbf07f
Nick Kralevich [Fri, 1 Mar 2013 00:46:22 +0000 (16:46 -0800)]
dumpstate: use correct header file.
Change-Id: I006d7a219ce6309259f271beff6011cc266f1a61
Eino-Ville Talvala [Thu, 28 Feb 2013 19:01:32 +0000 (11:01 -0800)]
CpuConsumer: Add optional asynchronous mode
Bug:
8290146
Bug:
8291751
Change-Id: I9c8ac4bff38b0411e987a204e540d018dba6d0b4
Jesse Hall [Thu, 28 Feb 2013 22:37:49 +0000 (22:37 +0000)]
am
a9a1b006: Initialize DisplayData fences to NO_FENCE, not NULL
* commit '
a9a1b006e48320f5c501473e51e6c4a5f7a17b88':
Initialize DisplayData fences to NO_FENCE, not NULL
Eino-Ville Talvala [Thu, 28 Feb 2013 22:08:34 +0000 (14:08 -0800)]
CpuConsumer: Don't unlock buffers on producer disconnect
Bug:
8291751
Change-Id: I062a3d34b41183d07fb6b9109cdb6bf0c0c75672
Chris Craik [Thu, 28 Feb 2013 22:16:33 +0000 (22:16 +0000)]
am
3e010f31: Add createTJunctionFreeRegion
* commit '
3e010f3138593cc6953039ee0e3db8ee31881296':
Add createTJunctionFreeRegion
The Android Automerger [Thu, 28 Feb 2013 13:55:48 +0000 (05:55 -0800)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Jesse Hall [Thu, 28 Feb 2013 00:39:25 +0000 (16:39 -0800)]
Initialize DisplayData fences to NO_FENCE, not NULL
Also fix another place that was checking for NULL fence rather than
Fence::isValid().
Bug
8283950
Change-Id: Ie06db327eb416828d8dac139171d96d4470b2e35
Chris Craik [Tue, 26 Feb 2013 03:12:47 +0000 (19:12 -0800)]
Add createTJunctionFreeRegion
T-junction free regions are useful for rendering regions with various
geometric transformations, and the Region's span-ordered, sorted rect
list supports T-junction free storage without modification.
This approach creates a T-junction free region by splitting each
rectangle that is part of a vertical T-junction. This approach is two
pass (up and down) so that divisions can trickle up/down to other
adjacent spans.
Change-Id: Ifcf5e6fe0034c96b00ef09a4433b2b0fce8f4300
The Android Automerger [Wed, 27 Feb 2013 15:49:37 +0000 (07:49 -0800)]
merge in master-release history after reset to master
The Android Automerger [Wed, 27 Feb 2013 13:55:31 +0000 (05:55 -0800)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Igor Murashkin [Wed, 27 Feb 2013 00:49:18 +0000 (00:49 +0000)]
am
68a029ed: Merge "GraphicBuffer.h: Remove redundant friend class declaration causing warnings" into jb-mr2-dev
* commit '
68a029edbbd162f2ca783733df37a44d5082ddee':
GraphicBuffer.h: Remove redundant friend class declaration causing warnings
Igor Murashkin [Wed, 27 Feb 2013 00:43:20 +0000 (00:43 +0000)]
Merge "GraphicBuffer.h: Remove redundant friend class declaration causing warnings" into jb-mr2-dev
Igor Murashkin [Tue, 26 Feb 2013 22:23:11 +0000 (14:23 -0800)]
GraphicBuffer.h: Remove redundant friend class declaration causing warnings
Change-Id: I8a4b0e0b4d0a1cf472de820553c31f2d42044543
The Android Automerger [Tue, 26 Feb 2013 16:50:53 +0000 (08:50 -0800)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Tue, 26 Feb 2013 15:49:58 +0000 (07:49 -0800)]
merge in master-release history after reset to master
Jamie Gennis [Mon, 25 Feb 2013 21:37:54 +0000 (13:37 -0800)]
SurfaceFlinger: fix a couple NULL fence checks
This change replaces checks for a NULL fence pointer with calls to
Fence::isValid. There should no longer be NULL fences.
Change-Id: If17c9c132fcb1801531bf7588f8ba53476c57dad
Mathias Agopian [Tue, 26 Feb 2013 00:58:18 +0000 (00:58 +0000)]
am
30055f1e: Merge "Added a test that checks the error behavior of ConsumerBase::abandon" into jb-mr2-dev
* commit '
30055f1e96f5a04c6ff5fc7f7d5812fca38c2759':
Added a test that checks the error behavior of ConsumerBase::abandon
Mathias Agopian [Tue, 26 Feb 2013 00:58:17 +0000 (00:58 +0000)]
am
d6f549f9: Merge "add some missing parameter validation in GLES java bindings" into jb-mr2-dev
* commit '
d6f549f92541d8ab947fe35e3b3c21133eed2a6f':
add some missing parameter validation in GLES java bindings
Mathias Agopian [Tue, 26 Feb 2013 00:53:28 +0000 (00:53 +0000)]
Merge "Added a test that checks the error behavior of ConsumerBase::abandon" into jb-mr2-dev
Mathias Agopian [Tue, 26 Feb 2013 00:53:13 +0000 (00:53 +0000)]
Merge "add some missing parameter validation in GLES java bindings" into jb-mr2-dev
Mathias Agopian [Sat, 23 Feb 2013 03:34:49 +0000 (19:34 -0800)]
Added a test that checks the error behavior of ConsumerBase::abandon
We check that calling eglSwapBuffers() on an abandonned BufferQueue
return EGL_BAD_SURFACE -- this is to ensure consistancy between
drivers.
Change-Id: Ibb548e0cf767ceee69f2fc4a85811d15a6522277
Mathias Agopian [Sat, 23 Feb 2013 03:34:06 +0000 (19:34 -0800)]
add some missing parameter validation in GLES java bindings
- added support for comments in checks.spec
- added most missing checks
- added and commented with // special-cased functions
- added and commented with # functions that are still missing validation checks
- moved glGet* to a special case and updated all the "pnames" from the khronos spec
- changed ifcheck to default to 1 value. this allows us to simplify the checks.spec file
and handle unknown pnames automatically (they'll be validated against 1 value, if
it happens to need more, the call will go through but the validation will not
happen).
- refactored the cpp headers in to a common header + GLES version specific
header
Bug:
7402895
Change-Id: Ib5c68ca0ca416407b4cfa36e3a21901b2d6263ab
Jamie Gennis [Mon, 25 Feb 2013 23:40:36 +0000 (23:40 +0000)]
am
789a6c3f: SurfaceFlinger: fix a couple NULL fence checks
* commit '
789a6c3f1dfe22a1ffea7f39b2098d7842cd1f30':
SurfaceFlinger: fix a couple NULL fence checks
Jamie Gennis [Mon, 25 Feb 2013 21:37:54 +0000 (13:37 -0800)]
SurfaceFlinger: fix a couple NULL fence checks
This change replaces checks for a NULL fence pointer with calls to
Fence::isValid. There should no longer be NULL fences.
Change-Id: If17c9c132fcb1801531bf7588f8ba53476c57dad
Mathias Agopian [Mon, 25 Feb 2013 22:52:01 +0000 (22:52 +0000)]
Merge "Added a test that checks the error behavior of ConsumerBase::abandon"
Mathias Agopian [Sat, 23 Feb 2013 03:34:49 +0000 (19:34 -0800)]
Added a test that checks the error behavior of ConsumerBase::abandon
We check that calling eglSwapBuffers() on an abandonned BufferQueue
return EGL_BAD_ALLOC -- this is to ensure consistancy between
drivers.
Change-Id: If84b082bc6bdea21673b16e5e717658c78edf405
Mathias Agopian [Sat, 23 Feb 2013 03:34:06 +0000 (19:34 -0800)]
add some missing parameter validation in GLES java bindings
- added support for comments in checks.spec
- added most missing checks
- added and commented with // special-cased functions
- added and commented with # functions that are still missing validation checks
- moved glGet* to a special case and updated all the "pnames" from the khronos spec
- changed ifcheck to default to 1 value. this allows us to simplify the checks.spec file
and handle unknown pnames automatically (they'll be validated against 1 value, if
it happens to need more, the call will go through but the validation will not
happen).
- refactored the cpp headers in to a common header + GLES version specific
header
Bug:
7402895
Change-Id: Ie8fcc713188dd4819dfa55e5398e6b53ae9a14af
The Android Automerger [Mon, 25 Feb 2013 15:50:01 +0000 (07:50 -0800)]
merge in master-release history after reset to master
Jesse Hall [Sun, 24 Feb 2013 00:18:55 +0000 (00:18 +0000)]
Merge changes Ic344ef63,If9bb02be,Ic8f94634
* changes:
Symlink /system/lib/libGLESv3.so -> libGLESv2.so
Add ES3 support to libGLESv2 and tracing tools
Import OpenGL ES 3.0 headers from Khronos SVN
Jesse Hall [Sat, 23 Feb 2013 04:56:31 +0000 (04:56 +0000)]
Merge changes I45836219,I70a4075e
* changes:
Regenerate API/trace files for constness change
Import constness fix from gl3.h into gl2.h.
Mathias Agopian [Sat, 23 Feb 2013 04:14:19 +0000 (04:14 +0000)]
Merge "sort the check file in alphabetical order"
Mathias Agopian [Sat, 23 Feb 2013 04:13:57 +0000 (04:13 +0000)]
Merge "update glgen to take into account recent changes"
Mathias Agopian [Sat, 23 Feb 2013 01:48:39 +0000 (17:48 -0800)]
sort the check file in alphabetical order
this simplifies a lot comparing it to the spec files.
Change-Id: I4b9b5e7469338a626100472d360ea26a902017bc
Mathias Agopian [Sat, 23 Feb 2013 04:04:22 +0000 (20:04 -0800)]
update glgen to take into account recent changes
- it looks like UserId has been renamed to UserHandle in the
framework.
- also for some reason I don't understand glgen didn't seem
to be up to date with respect to the generated bindings in the tree.
It's like the bindings were generated with a more recent version of
glgen (maybe it was never checked in). So we fix that here.
Change-Id: Ie49522ebf67fcab9213246b4d93500e37a3cbc05
Dmitry Shmidt [Fri, 22 Feb 2013 19:27:58 +0000 (11:27 -0800)]
Remove obsolte 'su' from 'ping' call (to work on user build)
Change-Id: I2d391bbd39fc591eef33b9c9e4b4cdbda29e41e7
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
The Android Automerger [Fri, 22 Feb 2013 15:50:02 +0000 (07:50 -0800)]
merge in master-release history after reset to master
Michael Wright [Fri, 22 Feb 2013 06:41:15 +0000 (22:41 -0800)]
Change SurfaceControl setPosition to take floats
Bug:
8153162
Change-Id: If3c4b7a3e124ace25999eb9a569dc9a806a1fbc2
Mathias Agopian [Thu, 21 Feb 2013 23:23:21 +0000 (23:23 +0000)]
Merge "get rid of Surface::getISurfaceTexture()"
The Android Automerger [Thu, 21 Feb 2013 16:33:32 +0000 (08:33 -0800)]
merge in master-release history after reset to master
Ed Heyl [Wed, 20 Feb 2013 21:47:29 +0000 (13:47 -0800)]
Merge remote-tracking branch 'goog/jb-mr2-release'
Mathias Agopian [Wed, 20 Feb 2013 02:24:40 +0000 (18:24 -0800)]
get rid of Surface::getISurfaceTexture()
this was there just for legacy reasons.
Change-Id: I0a48d6e04d7efa65033f9f10c91bba557f16ae8b
Eino-Ville Talvala [Tue, 19 Feb 2013 20:54:57 +0000 (12:54 -0800)]
Fixes to native app ops services
Bug:
8181262
Change-Id: I3d3f20453f6c6f2756c988363c5b5453ef309cb6
The Android Automerger [Tue, 19 Feb 2013 17:51:24 +0000 (09:51 -0800)]
merge in jb-mr2-release history after reset to master
Mathias Agopian [Sat, 16 Feb 2013 00:34:04 +0000 (16:34 -0800)]
fix build: SurfaceTextureClient to Surface rename
Change-Id: I0041e6f49bc637bc52161c83f0bd44101246f480
Mathias Agopian [Fri, 15 Feb 2013 22:59:09 +0000 (14:59 -0800)]
fix build: SurfaceTextureClient to Surface rename
Change-Id: I54d68241f1080eef640aefe71f33912ad79345ef
Mathias Agopian [Fri, 15 Feb 2013 22:48:52 +0000 (14:48 -0800)]
fix build: SurfaceTextureClient to Surface rename
Change-Id: Ibcf98337940f9195bcff7b5e8bddb6e912e65163
Mathias Agopian [Fri, 15 Feb 2013 01:11:02 +0000 (17:11 -0800)]
Refactoring: Rename SurfaceTextureClient to Surface
Change-Id: Ibed34175ae273608393aaa5f0a7df207dc40d709
Mathias Agopian [Thu, 14 Feb 2013 20:28:24 +0000 (20:28 +0000)]
Merge "remove access ANDROID_VIEW_SURFACE_JNI_ID"
Mathias Agopian [Thu, 14 Feb 2013 20:24:37 +0000 (20:24 +0000)]
Merge "get rid of Surface identity and token"
Elliott Hughes [Thu, 14 Feb 2013 19:42:06 +0000 (11:42 -0800)]
am
45b0e435: Merge "Simplify OpenGL TLS access on ARM."
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '
45b0e4350d3404bd194edc569e36ecca017c3d76':
Simplify OpenGL TLS access on ARM.