OSDN Git Service
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()"
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.
Elliott Hughes [Thu, 14 Feb 2013 18:31:20 +0000 (18:31 +0000)]
Merge "Simplify OpenGL TLS access on ARM."
The Android Automerger [Thu, 14 Feb 2013 13:55:53 +0000 (05:55 -0800)]
merge in jb-mr2-release history after reset to master
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
Alex Ray [Wed, 13 Feb 2013 23:29:59 +0000 (15:29 -0800)]
atrace: add HAL tag
Change-Id: Idfd4f2075e8cd82833ef06d4487423c62b59fe11
Mathias Agopian [Wed, 13 Feb 2013 23:26:48 +0000 (15:26 -0800)]
remove access ANDROID_VIEW_SURFACE_JNI_ID
Change-Id: I0ef474ed9be2cd26fa520ef871ffcf21a25e4994
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
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
The Android Automerger [Wed, 13 Feb 2013 13:55:55 +0000 (05:55 -0800)]
merge in jb-mr2-release history after reset to master
Jamie Gennis [Wed, 9 Jan 2013 02:05:17 +0000 (18:05 -0800)]
flatland: remove an unneeded #include
Change-Id: I50831d4efd543664ff7df7aaef35d842aebf1bd6
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
Dianne Hackborn [Tue, 12 Feb 2013 23:54:27 +0000 (23:54 +0000)]
Merge "Implement 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
Dianne Hackborn [Tue, 12 Feb 2013 23:29:05 +0000 (23:29 +0000)]
Merge "App 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
The Android Automerger [Tue, 12 Feb 2013 15:10:56 +0000 (07:10 -0800)]
merge in jb-mr2-release history after reset to master
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
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
The Android Automerger [Mon, 11 Feb 2013 15:11:15 +0000 (07:11 -0800)]
merge in jb-mr2-release history after reset to master
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"
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
James Dong [Sat, 9 Feb 2013 00:47:00 +0000 (00:47 +0000)]
Merge "Adds some OpenMAX 1.1.2 IL extension headers."
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
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
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
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>
The Android Automerger [Wed, 6 Feb 2013 15:10:52 +0000 (07:10 -0800)]
merge in jb-mr2-release history after reset to master
Mathias Agopian [Wed, 30 Jan 2013 02:56:42 +0000 (18:56 -0800)]
Add support for plane-alpha in HWC
Change-Id: I218e7dd5f23de535aabce61e993002ab6cb46cdd
Jesse Hall [Tue, 5 Feb 2013 16:02:50 +0000 (16:02 +0000)]
Merge "Remove unused HWCLayer::setPerFrameDefaultState()"
Jamie Gennis [Mon, 4 Feb 2013 22:43:07 +0000 (14:43 -0800)]
SurfaceFlinger: remove a driver bug workaround
Change-Id: I7478293e87899d6e467db8c2f9e295935c8b1d4e
The Android Automerger [Mon, 4 Feb 2013 15:10:46 +0000 (07:10 -0800)]
merge in jb-mr2-release history after reset to master
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.
Nick Kralevich [Sat, 2 Feb 2013 00:09:59 +0000 (00:09 +0000)]
Merge "try 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
Michael Wright [Fri, 1 Feb 2013 22:36:07 +0000 (22:36 +0000)]
Merge "Add keycodes for brightness up/down"
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
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
Jesse Hall [Fri, 1 Feb 2013 19:33:16 +0000 (19:33 +0000)]
Merge "Gfx-3d: fix GetProcAddress in egl extention"
Michael Wright [Thu, 31 Jan 2013 23:14:54 +0000 (15:14 -0800)]
Add keycodes for brightness up/down
Change-Id: I8ed56b510c46f372df0fc71e1735c72058efc677
The Android Automerger [Thu, 31 Jan 2013 15:10:38 +0000 (07:10 -0800)]
merge in jb-mr2-release history after reset to master
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
The Android Automerger [Wed, 30 Jan 2013 15:10:43 +0000 (07:10 -0800)]
merge in jb-mr2-release history after reset to master
Marco Nelissen [Tue, 29 Jan 2013 18:30:41 +0000 (18:30 +0000)]
Merge "Add new format constant"
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
Marco Nelissen [Thu, 17 Jan 2013 17:18:29 +0000 (09:18 -0800)]
Add new format constant
Change-Id: I8a53c69c9e44450b7ee3d32750965d53265812bf
Glenn Kasten [Wed, 16 Jan 2013 20:06:39 +0000 (12:06 -0800)]
Add media.log service
Change-Id: Ic17752fff30676fe692c80260ff68284543385dd
The Android Automerger [Wed, 16 Jan 2013 18:23:24 +0000 (10:23 -0800)]
merge in jb-mr2-release history after reset to master
Jesse Hall [Tue, 15 Jan 2013 14:56:48 +0000 (06:56 -0800)]
Merge "Fix 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
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
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
Jesse Hall [Mon, 14 Jan 2013 21:53:09 +0000 (13:53 -0800)]
Merge "DisplayDevice: initialize mDisplayToken correctly"
Jesse Hall [Mon, 14 Jan 2013 20:17:27 +0000 (12:17 -0800)]
Remove unused HWCLayer::setPerFrameDefaultState()
Bug:
7977590
Change-Id: Ic49c4e38ef2ee6beaeb268c406347c882135bdf0
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
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
Jesse Hall [Mon, 14 Jan 2013 17:25:21 +0000 (09:25 -0800)]
Merge "Remove support for legacy HWC version encoding"
The Android Automerger [Mon, 14 Jan 2013 15:49:35 +0000 (07:49 -0800)]
merge in master-release history after reset to master
Andy McFadden [Fri, 11 Jan 2013 23:05:39 +0000 (15:05 -0800)]
Merge "Add some comments."
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
Andy McFadden [Wed, 9 Jan 2013 00:06:15 +0000 (16:06 -0800)]
Add some comments.
Also, minor tweak to SurfaceTextureLayer.
Change-Id: If616d5ee4e8226dd0e16c5dbb0e0f80db553110e
Jesse Hall [Fri, 11 Jan 2013 00:19:56 +0000 (16:19 -0800)]
Remove support for legacy HWC version encoding
Change-Id: If03ae1ebf10d15777310e1449a57473021390582
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
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
Nick Kralevich [Thu, 10 Jan 2013 00:09:43 +0000 (16:09 -0800)]
Merge "Revert "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
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
Andy McFadden [Tue, 8 Jan 2013 19:25:51 +0000 (11:25 -0800)]
Minor tweaks.
Change-Id: I9f82f574112141b6aa074c42303056cd52d5c478
Chih-Wei Huang [Mon, 7 Jan 2013 09:33:56 +0000 (17:33 +0800)]
DisplayDevice: initialize mDisplayToken correctly
mDisplayToken should be initialized by displayToken.
Change-Id: I0a5fec1f1732200a32d10b1575239dceffe6dee4
Jamie Gennis [Sat, 22 Dec 2012 02:10:34 +0000 (18:10 -0800)]
Merge "flatland: add a GPU hardware benchmark"
Jamie Gennis [Tue, 4 Dec 2012 00:44:16 +0000 (16:44 -0800)]
flatland: add a GPU hardware benchmark
This change adds a GPU benchmark named 'flatland' that is intended to measure
GPU performance of UI rendering and compositing scenarios at a fixed a clock
frequency. This initial version includes only window compositing scenarios.
Change-Id: I5577863aa3be5c6da8b49cb5d53cc49dec2f7081
Siva Velusamy [Thu, 20 Dec 2012 18:52:00 +0000 (10:52 -0800)]
Merge "gltrace: Add support for tracing running applications."
Siva Velusamy [Tue, 18 Dec 2012 22:56:55 +0000 (14:56 -0800)]
gltrace: Add support for tracing running applications.
Currently, to activate OpenGL tracing, an application has to be
start with --opengl-trace option (or have a debug prop set).
This CL adds support for tracing an application which may already
be running. This is implemented as follows:
- DDMS initiates a JDWP message to the VM indicating that
opengl traces be enabled.
- When that message is received, a flag is set that indicates
that tracing should be enabled.
- The trace flag is checked during every eglSwap() operation,
and if it finds that tracing should be active and it isn't,
then it starts the tracing component.
Change-Id: I3347fe89fc06c7404d7aa9360f4b21e5bf36ebcb
Jeff Tinker [Thu, 29 Nov 2012 15:37:08 +0000 (07:37 -0800)]
Add DRM Client API header files for DASH support
Change-Id: Ia4cdcbe193d087d33e2ee91e6f5364cbcc237554
Jesse Hall [Wed, 19 Dec 2012 22:07:09 +0000 (14:07 -0800)]
Merge "Merge extensions as published at khronos.org"
Andy McFadden [Tue, 18 Dec 2012 17:49:45 +0000 (09:49 -0800)]
Rename ISurfaceTexture and SurfaceTexture
The C++ class names don't match what the classes do, so rename
ISurfaceTexture to IGraphicBufferProducer, and SurfaceTexture to
GLConsumer.
Bug
7736700
Change-Id: Ia03e468888025b5cae3c0ee1995434515dbea387
Andy McFadden [Mon, 17 Dec 2012 22:19:46 +0000 (14:19 -0800)]
Merge "Added some comments"
Marco Nelissen [Mon, 17 Dec 2012 21:42:05 +0000 (13:42 -0800)]
Merge "Add NULL check to CallStack::toString"
Andy McFadden [Thu, 13 Dec 2012 01:10:08 +0000 (17:10 -0800)]
Added some comments
Added a quick intro section at the top of the class. Also noted
the proposed new name for the class.
Change-Id: I3f79663527544aa4e910db0e5a1374b54d16ba2f
Marco Nelissen [Mon, 17 Dec 2012 18:28:20 +0000 (10:28 -0800)]
Add NULL check to CallStack::toString
CallStack::toString() has a 0 default argument, which ends up getting
passed to strlen(), resulting in a crash.
Change-Id: If706aff8c400983670f49cdbb66e11191ac76e0e
Andrew Hsieh [Mon, 17 Dec 2012 00:36:43 +0000 (16:36 -0800)]
Andrew Hsieh [Mon, 17 Dec 2012 00:35:31 +0000 (16:35 -0800)]
Andrew Hsieh [Mon, 17 Dec 2012 00:03:03 +0000 (16:03 -0800)]
Merge "Fix build"
Andrew Hsieh [Mon, 17 Dec 2012 00:01:36 +0000 (08:01 +0800)]
Fix build
Change-Id: Ie011cbf74a08f760ccd93ca37fa2b437b7063462
Andrew Hsieh [Sun, 16 Dec 2012 05:24:37 +0000 (21:24 -0800)]
am
d8f2daad: am
acfcd62a: Merge "Revert "Fix typo""
* commit '
d8f2daada3a828c5d9e6dfa29f53ab054618e129':
Revert "Fix typo"
Andrew Hsieh [Sun, 16 Dec 2012 05:24:35 +0000 (21:24 -0800)]
Andrew Hsieh [Sun, 16 Dec 2012 05:23:12 +0000 (21:23 -0800)]
am
acfcd62a: Merge "Revert "Fix typo""
* commit '
acfcd62aa9300087d3e8cca79e59b0abdcaaee35':
Revert "Fix typo"
Andrew Hsieh [Sun, 16 Dec 2012 05:23:12 +0000 (21:23 -0800)]
Andrew Hsieh [Sun, 16 Dec 2012 04:32:26 +0000 (20:32 -0800)]
Merge "Revert "Fix typo""
OSDN Git Service
