OSDN Git Service

android-x86/frameworks-native.git
11 years agorework screenshot API and implementation
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

11 years agoCpuConsumer: Add optional asynchronous mode
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

11 years agoCpuConsumer: Don't unlock buffers on producer disconnect
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

11 years agoInitialize DisplayData fences to NO_FENCE, not NULL
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

11 years agoAdd createTJunctionFreeRegion
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

11 years agoMerge "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

11 years agoGraphicBuffer.h: Remove redundant friend class declaration causing warnings
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

11 years agoMerge "Added a test that checks the error behavior of ConsumerBase::abandon" into...
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

11 years agoMerge "add some missing parameter validation in GLES java bindings" 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

11 years agoAdded 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_SURFACE -- this is to ensure consistancy between
drivers.

Change-Id: Ibb548e0cf767ceee69f2fc4a85811d15a6522277

11 years agoadd some missing parameter validation in GLES java bindings
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

11 years agoSurfaceFlinger: 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

11 years agoMerge changes Ic344ef63,If9bb02be,Ic8f94634
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

11 years agoMerge changes I45836219,I70a4075e
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.

11 years agoMerge "sort the check file in alphabetical order"
Mathias Agopian [Sat, 23 Feb 2013 04:14:19 +0000 (04:14 +0000)]
Merge "sort the check file in alphabetical order"

11 years agoMerge "update glgen to take into account recent changes"
Mathias Agopian [Sat, 23 Feb 2013 04:13:57 +0000 (04:13 +0000)]
Merge "update glgen to take into account recent changes"

11 years agosort the check file in alphabetical order
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

11 years agoupdate glgen to take into account recent changes
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

11 years agoRemove obsolte 'su' from 'ping' call (to work on user build)
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>
11 years agoChange SurfaceControl setPosition to take floats
Michael Wright [Fri, 22 Feb 2013 06:41:15 +0000 (22:41 -0800)]
Change SurfaceControl setPosition to take floats

Bug: 8153162
Change-Id: If3c4b7a3e124ace25999eb9a569dc9a806a1fbc2

11 years agoMerge "get rid of Surface::getISurfaceTexture()"
Mathias Agopian [Thu, 21 Feb 2013 23:23:21 +0000 (23:23 +0000)]
Merge "get rid of Surface::getISurfaceTexture()"

11 years agoMerge remote-tracking branch 'goog/jb-mr2-release'
Ed Heyl [Wed, 20 Feb 2013 21:47:29 +0000 (13:47 -0800)]
Merge remote-tracking branch 'goog/jb-mr2-release'

11 years agoget rid of Surface::getISurfaceTexture()
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

11 years agoFixes to native app ops services
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

11 years agomerge in jb-mr2-release history after reset to master
The Android Automerger [Tue, 19 Feb 2013 17:51:24 +0000 (09:51 -0800)]
merge in jb-mr2-release history after reset to master

11 years agofix build: SurfaceTextureClient to Surface rename
Mathias Agopian [Sat, 16 Feb 2013 00:34:04 +0000 (16:34 -0800)]
fix build: SurfaceTextureClient to Surface rename

Change-Id: I0041e6f49bc637bc52161c83f0bd44101246f480

11 years agofix build: SurfaceTextureClient to Surface rename
Mathias Agopian [Fri, 15 Feb 2013 22:59:09 +0000 (14:59 -0800)]
fix build: SurfaceTextureClient to Surface rename

Change-Id: I54d68241f1080eef640aefe71f33912ad79345ef

11 years agofix build: SurfaceTextureClient to Surface rename
Mathias Agopian [Fri, 15 Feb 2013 22:48:52 +0000 (14:48 -0800)]
fix build: SurfaceTextureClient to Surface rename

Change-Id: Ibcf98337940f9195bcff7b5e8bddb6e912e65163

11 years agoRefactoring: Rename SurfaceTextureClient to Surface
Mathias Agopian [Fri, 15 Feb 2013 01:11:02 +0000 (17:11 -0800)]
Refactoring: Rename SurfaceTextureClient to Surface

Change-Id: Ibed34175ae273608393aaa5f0a7df207dc40d709

11 years agoMerge "remove access ANDROID_VIEW_SURFACE_JNI_ID"
Mathias Agopian [Thu, 14 Feb 2013 20:28:24 +0000 (20:28 +0000)]
Merge "remove access ANDROID_VIEW_SURFACE_JNI_ID"

11 years agoMerge "get rid of Surface identity and token"
Mathias Agopian [Thu, 14 Feb 2013 20:24:37 +0000 (20:24 +0000)]
Merge "get rid of Surface identity and token"

11 years agoam 45b0e435: Merge "Simplify OpenGL TLS access on ARM."
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.

11 years agoMerge "Simplify OpenGL TLS access on ARM."
Elliott Hughes [Thu, 14 Feb 2013 18:31:20 +0000 (18:31 +0000)]
Merge "Simplify OpenGL TLS access on ARM."

11 years agomerge in jb-mr2-release history after reset to master
The Android Automerger [Thu, 14 Feb 2013 13:55:53 +0000 (05:55 -0800)]
merge in jb-mr2-release history after reset to master

11 years agoSimplify OpenGL TLS access on ARM.
Elliott Hughes [Thu, 14 Feb 2013 01:30:54 +0000 (17:30 -0800)]
Simplify OpenGL TLS access on ARM.

bionic now assumes the TLS register is available, so OpenGL can too.

Change-Id: If2b56a4c08de9f887759b78f70022026a181dc47

11 years agoSymlink /system/lib/libGLESv3.so -> libGLESv2.so
Jesse Hall [Sat, 9 Feb 2013 00:13:50 +0000 (16:13 -0800)]
Symlink /system/lib/libGLESv3.so -> libGLESv2.so

The platform has a unified GLES2/GLES3 wrapper in libGLESv2.so, which
is what bundled binaries should link against. The NDK will have
separate GLES2 and GLES3 libraries so that applications will get a
link error if they accidentally use GLES3 entry points in a GLES2
application. This symlink allows GLES3 NDK apps to load using the
unified wrapper.

Change-Id: Ic344ef63c334047fccebb55b7cb2fb23a4c2d61b

11 years agoatrace: add HAL tag
Alex Ray [Wed, 13 Feb 2013 23:29:59 +0000 (15:29 -0800)]
atrace: add HAL tag

Change-Id: Idfd4f2075e8cd82833ef06d4487423c62b59fe11

11 years agoremove access ANDROID_VIEW_SURFACE_JNI_ID
Mathias Agopian [Wed, 13 Feb 2013 23:26:48 +0000 (15:26 -0800)]
remove access ANDROID_VIEW_SURFACE_JNI_ID

Change-Id: I0ef474ed9be2cd26fa520ef871ffcf21a25e4994

11 years agoget rid of Surface identity and token
Mathias Agopian [Tue, 12 Feb 2013 00:40:36 +0000 (16:40 -0800)]
get rid of Surface identity and token

we use the IBinder instead.

Change-Id: I4aa0b58869ba43f19980013620051e5a261b062d

11 years agoMerge changes I50831d4e,I5360aebe
Jamie Gennis [Wed, 13 Feb 2013 23:22:04 +0000 (23:22 +0000)]
Merge changes I50831d4e,I5360aebe

* changes:
  flatland: remove an unneeded #include
  libgui: disallow NULL Fence pointers

11 years agomerge in jb-mr2-release history after reset to master
The Android Automerger [Wed, 13 Feb 2013 13:55:55 +0000 (05:55 -0800)]
merge in jb-mr2-release history after reset to master

11 years agoflatland: remove an unneeded #include
Jamie Gennis [Wed, 9 Jan 2013 02:05:17 +0000 (18:05 -0800)]
flatland: remove an unneeded #include

Change-Id: I50831d4efd543664ff7df7aaef35d842aebf1bd6

11 years agolibgui: disallow NULL Fence pointers
Jamie Gennis [Thu, 20 Dec 2012 22:05:45 +0000 (14:05 -0800)]
libgui: disallow NULL Fence pointers

This change eliminates the uses of a NULL sp<Fence> indicating that no waiting
is required.  Instead we use a non-NULL but invalid Fence object for which the
wait methods will return immediately.

Bug: 7892871
Change-Id: I5360aebe3090422ef6920d56c99fc4eedc642e48

11 years agoAdd ES3 support to libGLESv2 and tracing tools
Jesse Hall [Fri, 8 Feb 2013 19:13:46 +0000 (11:13 -0800)]
Add ES3 support to libGLESv2 and tracing tools

Since ES3 is backwards compatible with ES2, a new wrapper isn't
necessary, and the Khronos implementation guidelines recommend
supporting both versions with the same library.

Change-Id: If9bb02be60ce01cc5fe25d1f40c4e7f37244ebf6

11 years agoImport OpenGL ES 3.0 headers from Khronos SVN
Jesse Hall [Fri, 8 Feb 2013 18:35:43 +0000 (10:35 -0800)]
Import OpenGL ES 3.0 headers from Khronos SVN

Add MODULE_LICENSE_MIT: The GLES headers use an MIT license or a
slight variant of it (the "SGI Free Software License B version 2.0",
http://oss.sgi.com/projects/FreeB/).

Change-Id: Ic8f946341cdd0d579f51b6f7a3ee109cd31b1691

11 years agoMerge "Implement issue #6646859: 4K!!!! 4K!!!! 4K!!!!"
Dianne Hackborn [Tue, 12 Feb 2013 23:54:27 +0000 (23:54 +0000)]
Merge "Implement issue #6646859: 4K!!!!  4K!!!!  4K!!!!"

11 years agoImplement issue #6646859: 4K!!!! 4K!!!! 4K!!!!
Dianne Hackborn [Tue, 12 Feb 2013 23:36:31 +0000 (15:36 -0800)]
Implement issue #6646859: 4K!!!!  4K!!!!  4K!!!!

Change-Id: I1bb630c58d0d41446b726de1b9d2c3875fcbbceb

11 years agoMerge "App ops: new native access API."
Dianne Hackborn [Tue, 12 Feb 2013 23:29:05 +0000 (23:29 +0000)]
Merge "App ops: new native access API."

11 years agoApp ops: new native access API.
Dianne Hackborn [Tue, 12 Feb 2013 23:12:21 +0000 (15:12 -0800)]
App ops: new native access API.

This is to help implementation of bug #8181262 and maybe
bug #8181261

Note the current code has not yet been tested; it is only
known to compile at this point.

Change-Id: I489674c96d0d3fc0ddacc92611931a19a9ee5230

11 years agomerge in jb-mr2-release history after reset to master
The Android Automerger [Tue, 12 Feb 2013 15:10:56 +0000 (07:10 -0800)]
merge in jb-mr2-release history after reset to master

11 years agoRegenerate API/trace files for constness change
Jesse Hall [Thu, 7 Feb 2013 18:30:17 +0000 (10:30 -0800)]
Regenerate API/trace files for constness change

Change-Id: I45836219fc0e97607d83d458de9babb44f4c7534

11 years agoImport constness fix from gl3.h into gl2.h.
Alistair Strachan [Mon, 21 Jan 2013 19:24:32 +0000 (11:24 -0800)]
Import constness fix from gl3.h into gl2.h.

This change has been made in Khronos SVN for GLES2 already, however it
is mildly controversial and discussion is on-going.

This change is necessary for Android because otherwise applications
cannot include both GLES2/gl2.h and GLES3/gl3.h as the glShaderSource()
prototype mismatches. Native programs may include framework headers
(which now include GLES3 headers only) but already have included GLES2
headers, creating an incompatibility.

Change-Id: I70a4075e079ee063e76cef5a227abb0ae70aebb4

11 years agoForce a specific locale for sorting
Jesse Hall [Tue, 5 Feb 2013 00:15:39 +0000 (16:15 -0800)]
Force a specific locale for sorting

Avoids irrelevant output differences based on the user's locale. The
current output files were generated with a C or POSIX locale, and sort
differently under en_US.UTF-8.

Change-Id: I0dd85475e9ee2d58e7fa9fe2a4f86ad5c8142e00

11 years agoMerge changes I8bded1ea,I7478293e
Jamie Gennis [Mon, 11 Feb 2013 19:48:18 +0000 (19:48 +0000)]
Merge changes I8bded1ea,I7478293e

* changes:
  SurfaceFlinger: add win anim frame time tracking
  SurfaceFlinger: remove a driver bug workaround

11 years agomerge in jb-mr2-release history after reset to master
The Android Automerger [Mon, 11 Feb 2013 15:11:15 +0000 (07:11 -0800)]
merge in jb-mr2-release history after reset to master

11 years agoMerge "Do not use su to run the df command in bugreports"
Arve Hjønnevåg [Sat, 9 Feb 2013 01:41:09 +0000 (01:41 +0000)]
Merge "Do not use su to run the df command in bugreports"

11 years agoDo not use su to run the df command in bugreports
Ken Sumrall [Sat, 9 Feb 2013 01:35:58 +0000 (17:35 -0800)]
Do not use su to run the df command in bugreports

User builds do not have su, so when the bugreport attempts to report
disk free space, the command fails and nothing is reported.  However,
the df command does not need to be run as root to report free space,
so just run the command directly.

Change-Id: Ic7deb696f293e772ddf28eacfe16e4250af9a9f3

11 years agoMerge "Adds some OpenMAX 1.1.2 IL extension headers."
James Dong [Sat, 9 Feb 2013 00:47:00 +0000 (00:47 +0000)]
Merge "Adds some OpenMAX 1.1.2 IL extension headers."

11 years agoSurfaceFlinger: add win anim frame time tracking
Jamie Gennis [Tue, 5 Feb 2013 21:30:24 +0000 (13:30 -0800)]
SurfaceFlinger: add win anim frame time tracking

This change makes the 'dumpsys SurfaceFlinger --latency' command with no extra
args dump the frame timestamp data for the most recent frames that
SurfaceFlinger generated that included window animation transaction changes.

Change-Id: I8bded1ea08a4cddefef0aa955401052bb9107c90

11 years agoonly disable hwc when alpha < 1.0
Mathias Agopian [Fri, 8 Feb 2013 00:22:50 +0000 (16:22 -0800)]
only disable hwc when alpha < 1.0

Bug: 8149181
Change-Id: Ib3c7a44f04871e020adceeae16d002141ac758d4

11 years agoonly disable hwc when alpha < 1.0
Mathias Agopian [Fri, 8 Feb 2013 00:22:50 +0000 (16:22 -0800)]
only disable hwc when alpha < 1.0

Bug: 8149181
Change-Id: Ib3c7a44f04871e020adceeae16d002141ac758d4

11 years agoAdds some OpenMAX 1.1.2 IL extension headers.
Kunter Gultekin [Wed, 6 Feb 2013 16:03:47 +0000 (18:03 +0200)]
Adds some OpenMAX 1.1.2 IL extension headers.

Includes index and video extension headers
in order to support vpx specific parameters
and enable vpx encoder.

Note that existing (seemingly modified) version
of OMX_Video.h semantically conflicts with
official OMX_VideoExt.h because former includes
OMX_Video_CodingVPX as OMX_VIDEO_CODINGTYPE
whereas official extension headers denote
it as OMX_VIDEO_CodingVP8 within
OMX_VIDEO_CODINGEXTTYPE.

Change-Id: Ibab9663fcbc9c406a2cfb4bf79fe21e3b01a6e66
Signed-off-by: Kunter Gultekin <kuntergultekin@google.com>
11 years agomerge in jb-mr2-release history after reset to master
The Android Automerger [Wed, 6 Feb 2013 15:10:52 +0000 (07:10 -0800)]
merge in jb-mr2-release history after reset to master

11 years agoAdd support for plane-alpha in HWC
Mathias Agopian [Wed, 30 Jan 2013 02:56:42 +0000 (18:56 -0800)]
Add support for plane-alpha in HWC

Change-Id: I218e7dd5f23de535aabce61e993002ab6cb46cdd

11 years agoMerge "Remove unused HWCLayer::setPerFrameDefaultState()"
Jesse Hall [Tue, 5 Feb 2013 16:02:50 +0000 (16:02 +0000)]
Merge "Remove unused HWCLayer::setPerFrameDefaultState()"

11 years agoSurfaceFlinger: remove a driver bug workaround
Jamie Gennis [Mon, 4 Feb 2013 22:43:07 +0000 (14:43 -0800)]
SurfaceFlinger: remove a driver bug workaround

Change-Id: I7478293e87899d6e467db8c2f9e295935c8b1d4e

11 years agomerge in jb-mr2-release history after reset to master
The Android Automerger [Mon, 4 Feb 2013 15:10:46 +0000 (07:10 -0800)]
merge in jb-mr2-release history after reset to master

11 years agoRevert "try to fix win_sdk build."
Nick Kralevich [Sun, 3 Feb 2013 02:09:15 +0000 (18:09 -0800)]
Revert "try to fix win_sdk build."

A better change was checked into system/core. See commit
941daef629bd571032851edf7ae1dce24266640e

This reverts commit fa99d30ec773c5f9653d96570fb8961426bfe966.

11 years agoMerge "try to fix win_sdk build."
Nick Kralevich [Sat, 2 Feb 2013 00:09:59 +0000 (00:09 +0000)]
Merge "try to fix win_sdk build."

11 years agotry to fix win_sdk build.
Nick Kralevich [Sat, 2 Feb 2013 00:09:23 +0000 (16:09 -0800)]
try to fix win_sdk build.

Change-Id: I55e78e339874a6d6a3381c2550556b65c7ec1ca0

11 years agoMerge "Add keycodes for brightness up/down"
Michael Wright [Fri, 1 Feb 2013 22:36:07 +0000 (22:36 +0000)]
Merge "Add keycodes for brightness up/down"

11 years agoam 873ab60e: am 75b83e4d: Merge "Gfx-3d: fix GetProcAddress in egl extention"
Jesse Hall [Fri, 1 Feb 2013 22:26:21 +0000 (14:26 -0800)]
am 873ab60e: am 75b83e4d: Merge "Gfx-3d: fix GetProcAddress in egl extention"

# By luliuhui
# Via Android Git Automerger (1) and others
* commit '873ab60e94811488caea1906eb98133329a3e28f':
  Gfx-3d: fix GetProcAddress in egl extention

11 years agoam 75b83e4d: Merge "Gfx-3d: fix GetProcAddress in egl extention"
Jesse Hall [Fri, 1 Feb 2013 20:37:25 +0000 (12:37 -0800)]
am 75b83e4d: Merge "Gfx-3d: fix GetProcAddress in egl extention"

# By luliuhui
# Via Gerrit Code Review (1) and Shuo Gao (1)
* commit '75b83e4dc7d8055a70e590f868f7307fdaf656a7':
  Gfx-3d: fix GetProcAddress in egl extention

11 years agoMerge "Gfx-3d: fix GetProcAddress in egl extention"
Jesse Hall [Fri, 1 Feb 2013 19:33:16 +0000 (19:33 +0000)]
Merge "Gfx-3d: fix GetProcAddress in egl extention"

11 years agoAdd keycodes for brightness up/down
Michael Wright [Thu, 31 Jan 2013 23:14:54 +0000 (15:14 -0800)]
Add keycodes for brightness up/down

Change-Id: I8ed56b510c46f372df0fc71e1735c72058efc677

11 years agomerge in jb-mr2-release history after reset to master
The Android Automerger [Thu, 31 Jan 2013 15:10:38 +0000 (07:10 -0800)]
merge in jb-mr2-release history after reset to master

11 years agoExtend the HDCP API to also allow for a _decryption_ module, the counterpart
Andreas Huber [Wed, 30 Jan 2013 18:40:28 +0000 (10:40 -0800)]
Extend the HDCP API to also allow for a _decryption_ module, the counterpart

to what we previously defined exclusively.

Change-Id: I774d3cd7146da77675dcb90e33c9552cb7b10ac6

11 years agomerge in jb-mr2-release history after reset to master
The Android Automerger [Wed, 30 Jan 2013 15:10:43 +0000 (07:10 -0800)]
merge in jb-mr2-release history after reset to master

11 years agoMerge "Add new format constant"
Marco Nelissen [Tue, 29 Jan 2013 18:30:41 +0000 (18:30 +0000)]
Merge "Add new format constant"

11 years agoGfx-3d: fix GetProcAddress in egl extention
luliuhui [Thu, 30 Aug 2012 03:15:36 +0000 (11:15 +0800)]
Gfx-3d: fix GetProcAddress in egl extention

This patch can fix issue when Proc address return NULL.
Glbench10, egl-ext and conformance test need this patch to run pass.

Change-Id: I275c7cb6f77cb334c3ee7fa23cd696bba1c5a458
Author: Liuhui Lu <liuhui.lu@intel.com>
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 52622

11 years agoAdd new format constant
Marco Nelissen [Thu, 17 Jan 2013 17:18:29 +0000 (09:18 -0800)]
Add new format constant

Change-Id: I8a53c69c9e44450b7ee3d32750965d53265812bf

11 years agoAdd media.log service
Glenn Kasten [Wed, 16 Jan 2013 20:06:39 +0000 (12:06 -0800)]
Add media.log service

Change-Id: Ic17752fff30676fe692c80260ff68284543385dd

11 years agomerge in jb-mr2-release history after reset to master
The Android Automerger [Wed, 16 Jan 2013 18:23:24 +0000 (10:23 -0800)]
merge in jb-mr2-release history after reset to master

11 years agoMerge "Fix memory leak when getting signal time for unsignaled fences"
Jesse Hall [Tue, 15 Jan 2013 14:56:48 +0000 (06:56 -0800)]
Merge "Fix memory leak when getting signal time for unsignaled fences"

11 years agoFix memory leak when getting signal time for unsignaled fences
Jesse Hall [Mon, 14 Jan 2013 23:59:32 +0000 (15:59 -0800)]
Fix memory leak when getting signal time for unsignaled fences

Bug: 8000983
Change-Id: Ie88ed23fc5e8c95bfade364e090e90b7f070fa8e

11 years agoam fc866eb8: am 845ed8fd: Merge "DisplayDevice: initialize mDisplayToken correctly"
Jesse Hall [Mon, 14 Jan 2013 22:41:43 +0000 (14:41 -0800)]
am fc866eb8: am 845ed8fd: Merge "DisplayDevice: initialize mDisplayToken correctly"

* commit 'fc866eb8423cd1d720683946f7d102547718b6c9':
  DisplayDevice: initialize mDisplayToken correctly

11 years agoam 845ed8fd: Merge "DisplayDevice: initialize mDisplayToken correctly"
Jesse Hall [Mon, 14 Jan 2013 22:34:15 +0000 (14:34 -0800)]
am 845ed8fd: Merge "DisplayDevice: initialize mDisplayToken correctly"

* commit '845ed8fdaa34d0f684c93bf4dbadb9162f769235':
  DisplayDevice: initialize mDisplayToken correctly

11 years agoMerge "DisplayDevice: initialize mDisplayToken correctly"
Jesse Hall [Mon, 14 Jan 2013 21:53:09 +0000 (13:53 -0800)]
Merge "DisplayDevice: initialize mDisplayToken correctly"

11 years agoRemove unused HWCLayer::setPerFrameDefaultState()
Jesse Hall [Mon, 14 Jan 2013 20:17:27 +0000 (12:17 -0800)]
Remove unused HWCLayer::setPerFrameDefaultState()

Bug: 7977590
Change-Id: Ic49c4e38ef2ee6beaeb268c406347c882135bdf0

11 years agoam f3e9d5bd: am cbe51356: Merge "Remove support for legacy HWC version encoding"
Jesse Hall [Mon, 14 Jan 2013 17:52:16 +0000 (09:52 -0800)]
am f3e9d5bd: am cbe51356: Merge "Remove support for legacy HWC version encoding"

* commit 'f3e9d5bde57a41593a7dbc15e6f1fdb1ea64ea74':
  Remove support for legacy HWC version encoding

11 years agoam cbe51356: Merge "Remove support for legacy HWC version encoding"
Jesse Hall [Mon, 14 Jan 2013 17:47:49 +0000 (09:47 -0800)]
am cbe51356: Merge "Remove support for legacy HWC version encoding"

* commit 'cbe5135610cd3c919e6334fada72cc52238bb8b0':
  Remove support for legacy HWC version encoding

11 years agoMerge "Remove support for legacy HWC version encoding"
Jesse Hall [Mon, 14 Jan 2013 17:25:21 +0000 (09:25 -0800)]
Merge "Remove support for legacy HWC version encoding"

11 years agomerge in master-release history after reset to master
The Android Automerger [Mon, 14 Jan 2013 15:49:35 +0000 (07:49 -0800)]
merge in master-release history after reset to master

11 years agoMerge "Add some comments."
Andy McFadden [Fri, 11 Jan 2013 23:05:39 +0000 (15:05 -0800)]
Merge "Add some comments."

11 years agoReduce C++11 warnings
Andy McFadden [Fri, 11 Jan 2013 18:24:34 +0000 (10:24 -0800)]
Reduce C++11 warnings

A few typecasts to fix "narrowing conversion" complaints.

Change-Id: Ib2118079a2ca33959c748d03d8c6f1722d62e8fe

11 years agoAdd some comments.
Andy McFadden [Wed, 9 Jan 2013 00:06:15 +0000 (16:06 -0800)]
Add some comments.

Also, minor tweak to SurfaceTextureLayer.

Change-Id: If616d5ee4e8226dd0e16c5dbb0e0f80db553110e

11 years agoRemove support for legacy HWC version encoding
Jesse Hall [Fri, 11 Jan 2013 00:19:56 +0000 (16:19 -0800)]
Remove support for legacy HWC version encoding

Change-Id: If03ae1ebf10d15777310e1449a57473021390582

11 years agoRevert "App home directories are now 0700 for targetSdkVersion > 17"
Nick Kralevich [Thu, 10 Jan 2013 00:00:35 +0000 (16:00 -0800)]
Revert "App home directories are now 0700 for targetSdkVersion > 17"

This reverts commit 7f5c84a0b25706746a92ad1233cbbb8923eda54d.

Bug: 7966399
Bug: 7208882
Change-Id: I9fb13cf06c0f6605f3d992525346b14fe3259c66

11 years agoworkaround: don't reset compositionType to HWC_FRAMEBUFFER
Mathias Agopian [Mon, 19 Nov 2012 23:07:33 +0000 (15:07 -0800)]
workaround: don't reset compositionType to HWC_FRAMEBUFFER

This workaround a HWC HAL issue in Nexus 7, which causes videos and live
wallpapers to animate slowly.

Bug: 7563862
Change-Id: I87803aaad9751b1fd8392b9732304d4bccec659a

11 years agoMerge "Revert "App home directories are now 0700 for targetSdkVersion > 17""
Nick Kralevich [Thu, 10 Jan 2013 00:09:43 +0000 (16:09 -0800)]
Merge "Revert "App home directories are now 0700 for targetSdkVersion > 17""