The Android Automerger
3df66decb9
merge in jb-mr2-release history after reset to master
2013-01-31 07:10:38 -08:00
Andreas Huber
0dcde5213b
Extend the HDCP API to also allow for a _decryption_ module, the counterpart
...
to what we previously defined exclusively.
Change-Id: I774d3cd7146da77675dcb90e33c9552cb7b10ac6
2013-01-30 10:40:28 -08:00
The Android Automerger
0f75097639
merge in jb-mr2-release history after reset to master
2013-01-30 07:10:43 -08:00
Marco Nelissen
d8d9c5b89b
Merge "Add new format constant"
2013-01-29 18:30:41 +00:00
Marco Nelissen
62b40b3535
Add new format constant
...
Change-Id: I8a53c69c9e44450b7ee3d32750965d53265812bf
2013-01-17 09:18:29 -08:00
Glenn Kasten
64c8be0787
Add media.log service
...
Change-Id: Ic17752fff30676fe692c80260ff68284543385dd
2013-01-16 12:07:03 -08:00
The Android Automerger
8f2647efcf
merge in jb-mr2-release history after reset to master
2013-01-16 10:23:24 -08:00
Jesse Hall
f3df96026c
Merge "Fix memory leak when getting signal time for unsignaled fences"
2013-01-15 06:56:49 -08:00
Jesse Hall
7c36cd2315
Fix memory leak when getting signal time for unsignaled fences
...
Bug: 8000983
Change-Id: Ie88ed23fc5e8c95bfade364e090e90b7f070fa8e
2013-01-14 16:33:29 -08:00
Jesse Hall
7dd35a165d
am fc866eb8
: am 845ed8fd
: Merge "DisplayDevice: initialize mDisplayToken correctly"
...
* commit 'fc866eb8423cd1d720683946f7d102547718b6c9':
DisplayDevice: initialize mDisplayToken correctly
2013-01-14 14:41:43 -08:00
Jesse Hall
fc866eb842
am 845ed8fd
: Merge "DisplayDevice: initialize mDisplayToken correctly"
...
* commit '845ed8fdaa34d0f684c93bf4dbadb9162f769235':
DisplayDevice: initialize mDisplayToken correctly
2013-01-14 14:34:15 -08:00
Jesse Hall
845ed8fdaa
Merge "DisplayDevice: initialize mDisplayToken correctly"
2013-01-14 13:53:09 -08:00
Jesse Hall
800856a7b7
am f3e9d5bd
: am cbe51356
: Merge "Remove support for legacy HWC version encoding"
...
* commit 'f3e9d5bde57a41593a7dbc15e6f1fdb1ea64ea74':
Remove support for legacy HWC version encoding
2013-01-14 09:52:16 -08:00
Jesse Hall
f3e9d5bde5
am cbe51356
: Merge "Remove support for legacy HWC version encoding"
...
* commit 'cbe5135610cd3c919e6334fada72cc52238bb8b0':
Remove support for legacy HWC version encoding
2013-01-14 09:47:49 -08:00
Jesse Hall
cbe5135610
Merge "Remove support for legacy HWC version encoding"
2013-01-14 09:25:21 -08:00
The Android Automerger
5e5d7545e8
merge in master-release history after reset to master
2013-01-14 07:49:35 -08:00
Andy McFadden
c19c15174b
Merge "Add some comments."
2013-01-11 15:05:40 -08:00
Andy McFadden
8f06a8c2c8
Reduce C++11 warnings
...
A few typecasts to fix "narrowing conversion" complaints.
Change-Id: Ib2118079a2ca33959c748d03d8c6f1722d62e8fe
2013-01-11 10:24:34 -08:00
Andy McFadden
882e3a39ed
Add some comments.
...
Also, minor tweak to SurfaceTextureLayer.
Change-Id: If616d5ee4e8226dd0e16c5dbb0e0f80db553110e
2013-01-11 10:16:10 -08:00
Jesse Hall
7296051995
Remove support for legacy HWC version encoding
...
Change-Id: If03ae1ebf10d15777310e1449a57473021390582
2013-01-10 18:17:13 -08:00
Nick Kralevich
e9dbe75aa7
Revert "App home directories are now 0700 for targetSdkVersion > 17"
...
This reverts commit 7f5c84a0b2
.
Bug: 7966399
Bug: 7208882
Change-Id: I9fb13cf06c0f6605f3d992525346b14fe3259c66
2013-01-09 16:49:17 -08:00
Mathias Agopian
e0486f1503
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
2013-01-09 16:49:07 -08:00
Nick Kralevich
5001001d11
Merge "Revert "App home directories are now 0700 for targetSdkVersion > 17""
2013-01-09 16:09:43 -08:00
Nick Kralevich
a2d838a542
Revert "App home directories are now 0700 for targetSdkVersion > 17"
...
This reverts commit 7f5c84a0b2
.
Bug: 7966399
Bug: 7208882
Change-Id: I9fb13cf06c0f6605f3d992525346b14fe3259c66
2013-01-09 16:00:53 -08:00
Mathias Agopian
dd9d192287
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
2013-01-09 15:37:21 -08:00
Andy McFadden
466a192d20
Minor tweaks.
...
Change-Id: I9f82f574112141b6aa074c42303056cd52d5c478
2013-01-08 11:25:51 -08:00
Chih-Wei Huang
27e2562868
DisplayDevice: initialize mDisplayToken correctly
...
mDisplayToken should be initialized by displayToken.
Change-Id: I0a5fec1f1732200a32d10b1575239dceffe6dee4
2013-01-07 17:36:19 +08:00
Jamie Gennis
757c872c4a
Merge "flatland: add a GPU hardware benchmark"
2012-12-21 18:10:34 -08:00
Jamie Gennis
9c183f2493
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
2012-12-21 18:07:58 -08:00
Siva Velusamy
582dbf82f9
Merge "gltrace: Add support for tracing running applications."
2012-12-20 10:52:00 -08:00
Siva Velusamy
a73a97728b
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
2012-12-20 10:38:47 -08:00
Jeff Tinker
8ab80a2d71
Add DRM Client API header files for DASH support
...
Change-Id: Ia4cdcbe193d087d33e2ee91e6f5364cbcc237554
2012-12-19 16:34:37 -08:00
Jesse Hall
52f733c457
Merge "Merge extensions as published at khronos.org"
2012-12-19 14:07:09 -08:00
Andy McFadden
2adaf04fab
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
2012-12-18 13:10:48 -08:00
Andy McFadden
f7baee731e
Merge "Added some comments"
2012-12-17 14:19:46 -08:00
Marco Nelissen
cce6230b3c
Merge "Add NULL check to CallStack::toString"
2012-12-17 13:42:05 -08:00
Andy McFadden
0273adbf0b
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
2012-12-17 12:40:50 -08:00
Marco Nelissen
32130635f6
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
2012-12-17 10:28:20 -08:00
Andrew Hsieh
44615b8818
am 8d9f0118
: am fdd8551f
: Merge "Fix build"
...
* commit '8d9f0118926d54b5a5fc1508a7c43aa661839f1f':
Fix build
2012-12-16 16:36:43 -08:00
Andrew Hsieh
8d9f011892
am fdd8551f
: Merge "Fix build"
...
* commit 'fdd8551fe83754846cb91e2d7325ef90d2e0fb28':
Fix build
2012-12-16 16:35:31 -08:00
Andrew Hsieh
fdd8551fe8
Merge "Fix build"
2012-12-16 16:03:03 -08:00
Andrew Hsieh
370980c528
Fix build
...
Change-Id: Ie011cbf74a08f760ccd93ca37fa2b437b7063462
2012-12-17 08:01:36 +08:00
Andrew Hsieh
b41ad7ec0c
am d8f2daad
: am acfcd62a
: Merge "Revert "Fix typo""
...
* commit 'd8f2daada3a828c5d9e6dfa29f53ab054618e129':
Revert "Fix typo"
2012-12-15 21:24:37 -08:00
Andrew Hsieh
47c100110d
am 4bb20303
: am 670c570e
: Merge "Fix typo"
...
* commit '4bb20303d95e7d6242e648ce506ab939420dbe71':
Fix typo
2012-12-15 21:24:35 -08:00
Andrew Hsieh
d8f2daada3
am acfcd62a
: Merge "Revert "Fix typo""
...
* commit 'acfcd62aa9300087d3e8cca79e59b0abdcaaee35':
Revert "Fix typo"
2012-12-15 21:23:12 -08:00
Andrew Hsieh
4bb20303d9
am 670c570e
: Merge "Fix typo"
...
* commit '670c570e75e399432e96c9fd1dfa3fb92869f10c':
Fix typo
2012-12-15 21:23:12 -08:00
Andrew Hsieh
acfcd62aa9
Merge "Revert "Fix typo""
2012-12-15 20:32:27 -08:00
Andrew Hsieh
c7d5fa98b5
Revert "Fix typo"
...
This reverts commit c118edfc1a
Need to go together with https://android-review.googlesource.com/#/c/48117/
Change-Id: Ib413be1035cfb1d18cc9cf4099694a308dadf8f5
2012-12-15 20:31:56 -08:00
Andrew Hsieh
670c570e75
Merge "Fix typo"
2012-12-15 20:30:31 -08:00
Andrew Hsieh
c118edfc1a
Fix typo
...
Changed ANDROID_BITMAP_RESUT_SUCCESS -> ANDROID_BITMAP_RESULT_SUCCESS
Change-Id: I4e15e946107ea6f3d0955f72e97894512743c6ca
2012-12-16 11:20:34 +08:00