OSDN Git Service
Mathias Agopian [Fri, 22 Mar 2013 04:34:32 +0000 (04:34 +0000)]
am
30e5376b: am
50210b9a: fix a typo that broke all screenshots
* commit '
30e5376bfd077df221c15fabd58c91b6449fb258':
fix a typo that broke all screenshots
Mathias Agopian [Fri, 22 Mar 2013 04:33:20 +0000 (04:33 +0000)]
am
50210b9a: fix a typo that broke all screenshots
* commit '
50210b9a8d19cb90fc283d8d99e46cd34ac17d2e':
fix a typo that broke all screenshots
Mathias Agopian [Fri, 22 Mar 2013 04:13:21 +0000 (21:13 -0700)]
fix a typo that broke all screenshots
Bug:
8450197
Change-Id: I5b986cc0ff9c5e689d06a51ba68ab537d03d1f3d
Mathias Agopian [Fri, 22 Mar 2013 00:19:52 +0000 (00:19 +0000)]
am
5a120411: am
0188eeff: Merge "only use glReadPixels() when needed when taking screenshots" into jb-mr2-dev
* commit '
5a120411f02fe12fb4c80de0f6c899ad28273a30':
only use glReadPixels() when needed when taking screenshots
Mathias Agopian [Fri, 22 Mar 2013 00:18:27 +0000 (00:18 +0000)]
am
0188eeff: Merge "only use glReadPixels() when needed when taking screenshots" into jb-mr2-dev
* commit '
0188eeff1fecc3813ddb236be3e2b7a9ad156482':
only use glReadPixels() when needed when taking screenshots
Mathias Agopian [Fri, 22 Mar 2013 00:16:00 +0000 (00:16 +0000)]
Merge "only use glReadPixels() when needed when taking screenshots" into jb-mr2-dev
Mathias Agopian [Fri, 22 Mar 2013 00:05:41 +0000 (00:05 +0000)]
am
d839908e: am
504e1f26: Merge "initialize planeAlpha (to 0xFF) for the FB_TARGET" into jb-mr2-dev
* commit '
d839908ecff75aa516461cbacc984db2463f444f':
initialize planeAlpha (to 0xFF) for the FB_TARGET
Mathias Agopian [Fri, 22 Mar 2013 00:02:53 +0000 (00:02 +0000)]
am
504e1f26: Merge "initialize planeAlpha (to 0xFF) for the FB_TARGET" into jb-mr2-dev
* commit '
504e1f2638f6a5d7ad7ce66a89eaaaba15b452db':
initialize planeAlpha (to 0xFF) for the FB_TARGET
Mathias Agopian [Thu, 21 Mar 2013 23:58:38 +0000 (23:58 +0000)]
Merge "initialize planeAlpha (to 0xFF) for the FB_TARGET" into jb-mr2-dev
Mathias Agopian [Thu, 21 Mar 2013 23:25:12 +0000 (16:25 -0700)]
initialize planeAlpha (to 0xFF) for the FB_TARGET
Bug:
8422625
Change-Id: I7b72456c2e01ed92e675cc1bfa0cfd0d2ce5064e
Jamie Gennis [Thu, 21 Mar 2013 21:17:39 +0000 (21:17 +0000)]
am
0fa7ac9b: am
43122e7e: atrace: use creat instead of truncate
* commit '
0fa7ac9bec32cc530d820a3b94cdc428604a4b73':
atrace: use creat instead of truncate
Jamie Gennis [Thu, 21 Mar 2013 21:15:05 +0000 (21:15 +0000)]
am
43122e7e: atrace: use creat instead of truncate
* commit '
43122e7e672eb170334a4467dd41cf4bd545bae5':
atrace: use creat instead of truncate
Jamie Gennis [Thu, 21 Mar 2013 21:06:31 +0000 (14:06 -0700)]
atrace: use creat instead of truncate
Change-Id: Ie25c704f33c419c0c542249ae2841393862df0ab
Mathias Agopian [Thu, 21 Mar 2013 01:36:41 +0000 (18:36 -0700)]
only use glReadPixels() when needed when taking screenshots
some drivers don't support this yet, so we use a system
property to enable the glReadPixels "workaround" for them:
ro.bq.gpu_to_cpu_unsupported=1
Change-Id: I74d6a3a8f0cee8d5a507b72c760cf247e39195e0
Eino-Ville Talvala [Thu, 21 Mar 2013 16:41:40 +0000 (16:41 +0000)]
am
a010749b: am
aaebffd5: Merge "CpuConsumer: Properly track acquired buffers" into jb-mr2-dev
* commit '
a010749b41d20152389faa5832f1fc34c17cd930':
CpuConsumer: Properly track acquired buffers
Eino-Ville Talvala [Thu, 21 Mar 2013 16:40:18 +0000 (16:40 +0000)]
am
aaebffd5: Merge "CpuConsumer: Properly track acquired buffers" into jb-mr2-dev
* commit '
aaebffd52f1bfa3d239bba0d60b699c01c6d791c':
CpuConsumer: Properly track acquired buffers
Eino-Ville Talvala [Thu, 21 Mar 2013 16:39:13 +0000 (16:39 +0000)]
Merge "CpuConsumer: Properly track acquired buffers" into jb-mr2-dev
Ramanan Rajeswaran [Thu, 21 Mar 2013 15:55:14 +0000 (15:55 +0000)]
am
eda14c1b: am
ac006439: Merge "Revert "Revert "Change SurfaceControl setPosition to take floats""" into jb-mr2-dev
* commit '
eda14c1bef20d853f2e661244ec6a0f38c3192b7':
Revert "Revert "Change SurfaceControl setPosition to take floats""
Ramanan Rajeswaran [Thu, 21 Mar 2013 15:53:56 +0000 (15:53 +0000)]
am
ac006439: Merge "Revert "Revert "Change SurfaceControl setPosition to take floats""" into jb-mr2-dev
* commit '
ac006439bb635cd99d8dcbefe95fa680e21519b5':
Revert "Revert "Change SurfaceControl setPosition to take floats""
Ramanan Rajeswaran [Thu, 21 Mar 2013 15:52:48 +0000 (15:52 +0000)]
Merge "Revert "Revert "Change SurfaceControl setPosition to take floats""" into jb-mr2-dev
Ramanan Rajeswaran [Thu, 21 Mar 2013 15:49:59 +0000 (15:49 +0000)]
Revert "Revert "Change SurfaceControl setPosition to take floats""
This reverts commit
bbb57f3331c7182399ed82e9c4f93a965677dde3
Change-Id: Ib8f039f530d6b8175b5205c6c0008b135d4001a2
Mathias Agopian [Wed, 20 Mar 2013 23:01:24 +0000 (23:01 +0000)]
am
890b345f: am
7c1a487b: fix build. update test to new API
* commit '
890b345f061f2df74d4ac52c1cf7d56f1432f480':
fix build. update test to new API
Mathias Agopian [Wed, 20 Mar 2013 22:58:52 +0000 (22:58 +0000)]
am
7c1a487b: fix build. update test to new API
* commit '
7c1a487ba8c0a3b591a77e2ddcb33ef9bdfaff64':
fix build. update test to new API
Mathias Agopian [Wed, 20 Mar 2013 22:56:04 +0000 (15:56 -0700)]
fix build. update test to new API
Change-Id: I31ca84c85edff3e2ff90c554769e058110f27d49
Mathias Agopian [Wed, 20 Mar 2013 22:19:08 +0000 (22:19 +0000)]
am
89016cbf: am
ff7c2342: Merge "rework how we take screenshots for a CPU consumer" into jb-mr2-dev
* commit '
89016cbf4fa8681dde1c6f45c03685a0a0d69f3f':
rework how we take screenshots for a CPU consumer
Mathias Agopian [Wed, 20 Mar 2013 22:16:56 +0000 (22:16 +0000)]
am
ff7c2342: Merge "rework how we take screenshots for a CPU consumer" into jb-mr2-dev
* commit '
ff7c2342e246696defa121a984d9731d000adeaf':
rework how we take screenshots for a CPU consumer
Mathias Agopian [Wed, 20 Mar 2013 22:14:55 +0000 (22:14 +0000)]
Merge "rework how we take screenshots for a CPU consumer" into jb-mr2-dev
Jeff Sharkey [Wed, 20 Mar 2013 19:14:07 +0000 (19:14 +0000)]
am
93628db3: am
a6c1ab52: Merge "Move screenshots near beginning of dumpstate." into jb-mr2-dev
* commit '
93628db30a8ca825585cd7d04ccdf9bb53cc189f':
Move screenshots near beginning of dumpstate.
Jeff Sharkey [Wed, 20 Mar 2013 19:12:44 +0000 (19:12 +0000)]
am
a6c1ab52: Merge "Move screenshots near beginning of dumpstate." into jb-mr2-dev
* commit '
a6c1ab52e30fc63c8822e1f0cc6c5aea6328a69b':
Move screenshots near beginning of dumpstate.
Jeff Sharkey [Wed, 20 Mar 2013 19:09:44 +0000 (19:09 +0000)]
Merge "Move screenshots near beginning of dumpstate." into jb-mr2-dev
Jeff Tinker [Wed, 20 Mar 2013 16:56:13 +0000 (16:56 +0000)]
am
e507d46e: am
30041bd3: Merge "Updated MediaDrm API based on review input." into jb-mr2-dev
* commit '
e507d46e72f85723f5443b5607e2828b016e657a':
Updated MediaDrm API based on review input.
Jeff Tinker [Wed, 20 Mar 2013 16:53:16 +0000 (16:53 +0000)]
am
30041bd3: Merge "Updated MediaDrm API based on review input." into jb-mr2-dev
* commit '
30041bd3a487c3bfe45a5b802a0d3443cfcc0c51':
Updated MediaDrm API based on review input.
Jeff Tinker [Wed, 20 Mar 2013 16:47:34 +0000 (16:47 +0000)]
Merge "Updated MediaDrm API based on review input." into jb-mr2-dev
The Android Open Source Project [Wed, 20 Mar 2013 16:46:48 +0000 (16:46 +0000)]
am
0371fd02: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
0371fd021f2f445b4041dc38f91ec25f10253455':
am
7212ff29: am
20e154f1: Merge "Second try at adding a compatibility symbol for the MemoryBase constructor."
size IMemoryHeap properly for screenshots
The Android Open Source Project [Wed, 20 Mar 2013 16:32:41 +0000 (09:32 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I9b1d766e6519a720cee8327d1ec71d9f69dd7387
The Android Automerger [Wed, 20 Mar 2013 12:55:54 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Mathias Agopian [Wed, 20 Mar 2013 05:22:21 +0000 (22:22 -0700)]
rework how we take screenshots for a CPU consumer
We're not using IMemoryHeap as a transport anymore,
instead we're providing a CpuConsumer and use the
IGraphicBufferProducer version of the screenshot API.
However, some GPU drivers don't support properly
a GPU to CPU path, to work around this, we use a
temporary BufferQueue on the server side for the
GL rendering, and we use glReadPixels into the
CpuConsumer (we're now using a CPU to CPU path
which is always supported).
Currently this "wrapping" is always performed,
but it can be bypassed on devices that support
the GPU to CPU path.
This also addresses a DoS attack vector on
SurfaceFlinger, where an application could
consume all of SF's filedescriptors by creating
a lot of screenshots in a row.
Bug:
8390553
Change-Id: I9e81514c2a7711b9bb393f74305be7d2abe08f1c
Mathias Agopian [Wed, 20 Mar 2013 00:54:41 +0000 (00:54 +0000)]
am
656a6780: am
9cd766a5: disable RefBase consistency checks (NDEBUG)
* commit '
656a6780b5714c8667f604d7925729325d1cbcef':
disable RefBase consistency checks (NDEBUG)
Mathias Agopian [Wed, 20 Mar 2013 00:54:41 +0000 (00:54 +0000)]
am
dd3fcd2e: am
4e37ddff: Fix a crasher with RefBase debugging and vectors of wp<>
* commit '
dd3fcd2e583f5aff7ef390442fe4ed6395d4cc4c':
Fix a crasher with RefBase debugging and vectors of wp<>
Mathias Agopian [Wed, 20 Mar 2013 00:42:21 +0000 (00:42 +0000)]
am
9cd766a5: disable RefBase consistency checks (NDEBUG)
* commit '
9cd766a517caeb58669722fad7fdf623a8c1b83c':
disable RefBase consistency checks (NDEBUG)
Mathias Agopian [Wed, 20 Mar 2013 00:36:57 +0000 (17:36 -0700)]
disable RefBase consistency checks (NDEBUG)
Bug:
8328715
Change-Id: Ib57646ff909fd8744610f37f3b50d90d884dff31
Mathias Agopian [Wed, 20 Mar 2013 00:27:46 +0000 (00:27 +0000)]
am
4e37ddff: Fix a crasher with RefBase debugging and vectors of wp<>
* commit '
4e37ddff43784a5a784beb4b62ea3f3136e1634b':
Fix a crasher with RefBase debugging and vectors of wp<>
Mathias Agopian [Tue, 19 Mar 2013 05:27:41 +0000 (22:27 -0700)]
Fix a crasher with RefBase debugging and vectors of wp<>
background:
we have some code to fix-up the IDs of references when
using RefBase's DEBUG_REFS when those refs are managed by
arrays wp<> or sp<> (this is because wp<> / sp<> don't have
a trivial ctor when DEBUG_REFS is enabled, and Vector
treats them as trivial for obvious performance reasons)
this is complicated by the fact that we don't want to have
to recompile everything when enabling DEBUG_REFs (i.e.: the
Vector code cannot know wheter it's enabled or not for its
template stuff).
problem:
there was a bug in the fix-up code for wp<> which was trying
to access the weakref_impl from the RefBase* however, this was
moronic since RefBase could have been destroyed if there wasn't
any more strong refs -- and this happned. Instead we need to get
the weakref_impl directly from the wp<>
Change-Id: Ie16e334204205fdbff142acb9faff8479a78450b
Mathias Agopian [Tue, 19 Mar 2013 23:06:06 +0000 (23:06 +0000)]
am
364a1f95: am
ca987c87: Merge "A few tweaks to RefBase debugging" into jb-mr2-dev
* commit '
364a1f95786746118d62c90279aa3dd8eb93db8d':
A few tweaks to RefBase debugging
Mathias Agopian [Tue, 19 Mar 2013 23:02:47 +0000 (23:02 +0000)]
am
ca987c87: Merge "A few tweaks to RefBase debugging" into jb-mr2-dev
* commit '
ca987c877549b0d5472e91ded98f3ba6fea8a96d':
A few tweaks to RefBase debugging
Mathias Agopian [Tue, 19 Mar 2013 23:00:40 +0000 (23:00 +0000)]
Merge "A few tweaks to RefBase debugging" into jb-mr2-dev
Jeff Sharkey [Tue, 19 Mar 2013 22:05:19 +0000 (15:05 -0700)]
Move screenshots near beginning of dumpstate.
Bug:
8420215
Change-Id: I6adffd1182ed8f99b8d11d43785a4eb4a388ceb5
Jesse Hall [Tue, 19 Mar 2013 20:51:45 +0000 (20:51 +0000)]
am
4af2b42b: am
ef64b75a: Don\'t log an error on HWC1.1+ devices with no FB HAL
* commit '
4af2b42b588c817a1a0d2fc4b78f86c450b33212':
Don't log an error on HWC1.1+ devices with no FB HAL
Jesse Hall [Tue, 19 Mar 2013 20:49:09 +0000 (20:49 +0000)]
am
ef64b75a: Don\'t log an error on HWC1.1+ devices with no FB HAL
* commit '
ef64b75a936ffd194673dbce6766995f86b42ba9':
Don't log an error on HWC1.1+ devices with no FB HAL
Jesse Hall [Mon, 18 Mar 2013 18:28:50 +0000 (11:28 -0700)]
Don't log an error on HWC1.1+ devices with no FB HAL
Change-Id: I015e5a1a1f926181e51f82525f69beff71bd70cd
Jesse Hall [Tue, 19 Mar 2013 17:49:21 +0000 (17:49 +0000)]
am
88f70a21: am
fae23b87: Merge changes I61ae54f3,I57cb668e,I7a3f1e1a,Id28a2f9b into jb-mr2-dev
* commit '
88f70a2167528ec849845e1203cfd9c6ff35a67d':
Add BufferQueueInterposer and use it for virtual displays
Add DisplaySurface abstraction
Fix argument types in IGraphicBufferProducer methods
Minor cleanups/fixes before virtual display refactoring
Jesse Hall [Tue, 19 Mar 2013 17:47:30 +0000 (17:47 +0000)]
am
fae23b87: Merge changes I61ae54f3,I57cb668e,I7a3f1e1a,Id28a2f9b into jb-mr2-dev
* commit '
fae23b8757a6e1b70997db28a2eaf34f9ddc9b84':
Add BufferQueueInterposer and use it for virtual displays
Add DisplaySurface abstraction
Fix argument types in IGraphicBufferProducer methods
Minor cleanups/fixes before virtual display refactoring
Jesse Hall [Tue, 19 Mar 2013 17:45:29 +0000 (17:45 +0000)]
Merge changes I61ae54f3,I57cb668e,I7a3f1e1a,Id28a2f9b into jb-mr2-dev
* changes:
Add BufferQueueInterposer and use it for virtual displays
Add DisplaySurface abstraction
Fix argument types in IGraphicBufferProducer methods
Minor cleanups/fixes before virtual display refactoring
The Android Automerger [Tue, 19 Mar 2013 12:55:29 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Mathias Agopian [Tue, 19 Mar 2013 03:31:18 +0000 (20:31 -0700)]
A few tweaks to RefBase debugging
- stacks are now saved in /data/debug which must be
created and writable by the user.
- removed "always fatal" DEBUG_REFS option, it wasn't
really needed.
- DEBUG_REFS_ENABLED_BY_DEFAULT is not the default anymore
(usually people want to target which refs they're tracking)
Change-Id: I37fae72e9dacde6ce1fa8f7dbe2bc01b1a1b95e5
Jamie Gennis [Mon, 18 Mar 2013 21:58:11 +0000 (21:58 +0000)]
am
0bb2d18a: am
79fb99d0: Merge "atrace: add support for tracing kernel functions" into jb-mr2-dev
* commit '
0bb2d18a82960557608f8152fdd51f845fbc1892':
atrace: add support for tracing kernel functions
Jamie Gennis [Mon, 18 Mar 2013 21:56:43 +0000 (21:56 +0000)]
am
79fb99d0: Merge "atrace: add support for tracing kernel functions" into jb-mr2-dev
* commit '
79fb99d0dea4d301d1bf25273c6af4907ca124bc':
atrace: add support for tracing kernel functions
Jamie Gennis [Mon, 18 Mar 2013 21:54:44 +0000 (21:54 +0000)]
Merge "atrace: add support for tracing kernel functions" into jb-mr2-dev
Jesse Hall [Fri, 15 Mar 2013 19:32:10 +0000 (12:32 -0700)]
Add BufferQueueInterposer and use it for virtual displays
BufferQueueInterposer allows a client to tap into a
IGraphicBufferProducer-based buffer queue, and modify buffers as they
pass from producer to consumer. VirtualDisplaySurface uses this to
layer HWC composition on top of GLES composition before passing the
buffer to the virtual display consumer.
Bug:
8384764
Change-Id: I61ae54f3d90de6a35f4f02bb5e64e7cc88e1cb83
Jesse Hall [Thu, 14 Mar 2013 21:29:29 +0000 (14:29 -0700)]
Add DisplaySurface abstraction
DisplayDevice now has a DisplaySurface instead of using
FramebufferSurface directly. FramebufferSurface implements
DisplaySurface, and so does the new VirtualDisplaySurface class.
DisplayDevice now always has a surface, not just for virtual displays.
In this change VirtualDisplaySurface is just a stub; buffers still go
directly from GLES to the final consumer.
Bug:
8384764
Change-Id: I57cb668edbc6c37bfebda90b9222d435bf589f37
Jesse Hall [Sat, 16 Mar 2013 04:34:30 +0000 (21:34 -0700)]
Fix argument types in IGraphicBufferProducer methods
Bug:
8384764
Change-Id: I7a3f1e1a0584a70af04f9eafef900505389d2202
Jesse Hall [Thu, 7 Mar 2013 00:13:49 +0000 (16:13 -0800)]
Minor cleanups/fixes before virtual display refactoring
None of these should change behavior, except for removing some
incorrect log messages when using a virtual display.
- HWComposer::getAndResetReleaseFenceFd() checks the HWC version, so
no need to do that in the DisplayDevice::onSwapBuffersCompleted().
However, it should check that mFramebufferSurface is not NULL like
it is for virtual displays.
- Comment that FramebufferSurface::dump() overrides the non-virtual
ConsumerBase::dump(), and fix it so the right thing happens
regardless of the static type of the pointer/reference the callee
has. FramebufferSurface::dump() could be removed right now, but I'd
need to bring it back in a later change.
- Use the right enum for validating display type ids.
- Don't try to send hotplug events for virtual displays.
- Mark virtual displays as connected so HWComposer::prepare() doesn't
think something is wrong when it gets a non-NULL layer list.
- Remove unused FramebufferSurface methods.
Bug:
8384764
Change-Id: Id28a2f9be86b45f4bb7915fdf7752157035f4294
Jamie Gennis [Tue, 12 Mar 2013 23:00:10 +0000 (16:00 -0700)]
atrace: add support for tracing kernel functions
This change adds support for tracing specific kernel function calls using the
function_graph tracer. It adds a '-k' option to atrace that accepts a comma
separated list of kernel function names for which tracing will be enabled.
Change-Id: I872b2f1d474b8ebb904053853fc8cf8c0a98089c
The Android Automerger [Mon, 18 Mar 2013 12:55:58 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Jesse Hall [Sun, 17 Mar 2013 16:27:56 +0000 (16:27 +0000)]
am
df608eb1: am
ce7e2781: Merge "Add Vector::resize()" into jb-mr2-dev
* commit '
df608eb15d3b90d2e71e07baaa6de423c29769c8':
Add Vector::resize()
Mathias Agopian [Sun, 17 Mar 2013 16:27:56 +0000 (16:27 +0000)]
am
df6c6e97: am
041a0752: don\'t allow screenshots without the READ_FRAMEBUFFER permission
* commit '
df6c6e97b52cbd84f04d1be9a03f44816919dc37':
don't allow screenshots without the READ_FRAMEBUFFER permission
Mathias Agopian [Sun, 17 Mar 2013 16:18:35 +0000 (16:18 +0000)]
am
0714d09e: am
7670d3cb: Merge "get rid of purgatory and fix QueuesToWindowComposer query" into jb-mr2-dev
* commit '
0714d09e47d86cf9c437f670b0cb043b1fe28631':
get rid of purgatory and fix QueuesToWindowComposer query
Jesse Hall [Sun, 17 Mar 2013 16:18:34 +0000 (16:18 +0000)]
am
ce7e2781: Merge "Add Vector::resize()" into jb-mr2-dev
* commit '
ce7e278151d268f3cf55bcecd05f6be8c7e82e0f':
Add Vector::resize()
Mathias Agopian [Sun, 17 Mar 2013 16:18:34 +0000 (16:18 +0000)]
am
041a0752: don\'t allow screenshots without the READ_FRAMEBUFFER permission
* commit '
041a075262ef5fc886e46fd4eec3dd79ee2e60c0':
don't allow screenshots without the READ_FRAMEBUFFER permission
Jesse Hall [Sat, 16 Mar 2013 03:23:12 +0000 (03:23 +0000)]
Merge "Add Vector::resize()" into jb-mr2-dev
Mathias Agopian [Sat, 16 Mar 2013 01:31:56 +0000 (18:31 -0700)]
don't allow screenshots without the READ_FRAMEBUFFER permission
the recent screenshot rework allowed the older screenshot
interface to work without that permission
Change-Id: I6c4743f4591c81106e3b823d55a055f7b4907de1
Mathias Agopian [Sat, 16 Mar 2013 01:16:22 +0000 (01:16 +0000)]
am
7670d3cb: Merge "get rid of purgatory and fix QueuesToWindowComposer query" into jb-mr2-dev
* commit '
7670d3cb2b5d38c60135f34a2446e1ae809d1b32':
get rid of purgatory and fix QueuesToWindowComposer query
Mathias Agopian [Sat, 16 Mar 2013 01:14:34 +0000 (01:14 +0000)]
Merge "get rid of purgatory and fix QueuesToWindowComposer query" into jb-mr2-dev
Mathias Agopian [Fri, 15 Mar 2013 23:17:45 +0000 (23:17 +0000)]
am
28e89fed: am
a493be58: don\'t capture hidden layers in screenshots
* commit '
28e89fed092dfc1d4a182e98a59f4ec5c3148625':
don't capture hidden layers in screenshots
Mathias Agopian [Fri, 15 Mar 2013 23:16:30 +0000 (23:16 +0000)]
am
a493be58: don\'t capture hidden layers in screenshots
* commit '
a493be5825d15f6a94d1afb5910db075a2a7abc1':
don't capture hidden layers in screenshots
Mathias Agopian [Fri, 15 Mar 2013 23:08:10 +0000 (16:08 -0700)]
don't capture hidden layers in screenshots
Bug:
8389956
Change-Id: I9ed836395258732c743c6fd44092bd01020dde13
Jesse Hall [Mon, 11 Mar 2013 17:16:48 +0000 (10:16 -0700)]
Add Vector::resize()
Bug:
8384764
Change-Id: Icee83d389f3e555eba7d419b64c8d52a9aa21b8b
Dianne Hackborn [Fri, 15 Mar 2013 04:35:16 +0000 (04:35 +0000)]
am
5f72d05a: am
1791eefd: fix a couple race-conditions in RefBase::promote()
* commit '
5f72d05a01d9b7a1bd6d2a2a269b80facd206066':
fix a couple race-conditions in RefBase::promote()
Dianne Hackborn [Fri, 15 Mar 2013 04:33:06 +0000 (04:33 +0000)]
am
1791eefd: fix a couple race-conditions in RefBase::promote()
* commit '
1791eefd69e07a7d8a311ee8a298bbd2de77f046':
fix a couple race-conditions in RefBase::promote()
Mathias Agopian [Fri, 15 Mar 2013 02:18:13 +0000 (19:18 -0700)]
get rid of purgatory and fix QueuesToWindowComposer query
the purgatory list wasn't needed anymore; in fact it had no effect as
buffer life-time management is now handled by the BufferQueue.
For QueuesToWindowComposer we keep a list of wp<> on the IBinder
for IGraphicBufferProducers we hand over to clients so we can
easily check if an IGraphicBufferProducer is ours. We clean-up the
list when our IGraphicBufferProducer are destroyed.
Bug:
8349142
Change-Id: I1aa06652ade8c72d0004a3f5e6c3d6e8a82fc2ae
Dianne Hackborn [Thu, 14 Mar 2013 22:26:30 +0000 (15:26 -0700)]
fix a couple race-conditions in RefBase::promote()
Bug:
8390295
Change-Id: I7a48e3bf5b213cc1da2b8e844c6bb37ee24cb047
Elliott Hughes [Thu, 14 Mar 2013 17:31:38 +0000 (10:31 -0700)]
am
7212ff29: am
20e154f1: Merge "Second try at adding a compatibility symbol for the MemoryBase constructor."
* commit '
7212ff29c6f4e4cd192fee6f072e80b36d8a728b':
Second try at adding a compatibility symbol for the MemoryBase constructor.
Elliott Hughes [Thu, 14 Mar 2013 17:36:01 +0000 (17:36 +0000)]
am
9bd5c827: am
5b00af24: am
7212ff29: am
20e154f1: Merge "Second try at adding a compatibility symbol for the MemoryBase constructor."
* commit '
9bd5c8274c822540473dfc646b47b4121785c727':
Second try at adding a compatibility symbol for the MemoryBase constructor.
Elliott Hughes [Thu, 14 Mar 2013 17:33:59 +0000 (17:33 +0000)]
am
5b00af24: am
7212ff29: am
20e154f1: Merge "Second try at adding a compatibility symbol for the MemoryBase constructor."
* commit '
5b00af2435d67ccf806c918f6482949870fd993b':
Second try at adding a compatibility symbol for the MemoryBase constructor.
Elliott Hughes [Thu, 14 Mar 2013 17:31:38 +0000 (10:31 -0700)]
am
7212ff29: am
20e154f1: Merge "Second try at adding a compatibility symbol for the MemoryBase constructor."
* commit '
7212ff29c6f4e4cd192fee6f072e80b36d8a728b':
Second try at adding a compatibility symbol for the MemoryBase constructor.
Jeff Sharkey [Thu, 14 Mar 2013 17:26:10 +0000 (17:26 +0000)]
am
a6d94e8d: am
a11713ce: Merge "Increase screenshot timeout." into jb-mr2-dev
* commit '
a6d94e8dfe7a251066b74bb3f3a6722e0c2713b5':
Increase screenshot timeout.
Jeff Sharkey [Thu, 14 Mar 2013 17:22:50 +0000 (17:22 +0000)]
am
a11713ce: Merge "Increase screenshot timeout." into jb-mr2-dev
* commit '
a11713ce3e81d7838092168fad110bea3212a9f3':
Increase screenshot timeout.
Jeff Sharkey [Thu, 14 Mar 2013 17:21:08 +0000 (17:21 +0000)]
Merge "Increase screenshot timeout." into jb-mr2-dev
Jeff Sharkey [Thu, 14 Mar 2013 17:20:31 +0000 (10:20 -0700)]
Increase screenshot timeout.
Devices with large displays take longer than 5 seconds to write.
Change-Id: If74bc4a3cec366ae28eca549bce28ef212e47d8f
Elliott Hughes [Thu, 14 Mar 2013 15:57:59 +0000 (15:57 +0000)]
am
9943b7b9: am
801e632a: am
6250f6cb: am
d8151306: Merge "Revert "Add a compatibility symbol for the MemoryBase constructor.""
* commit '
9943b7b9a5bfabe5f306f780fc9ab8ba9938a652':
Revert "Add a compatibility symbol for the MemoryBase constructor."
Elliott Hughes [Thu, 14 Mar 2013 15:56:50 +0000 (15:56 +0000)]
am
801e632a: am
6250f6cb: am
d8151306: Merge "Revert "Add a compatibility symbol for the MemoryBase constructor.""
* commit '
801e632a1913819a7bf8542615caa80018c0f266':
Revert "Add a compatibility symbol for the MemoryBase constructor."
Elliott Hughes [Thu, 14 Mar 2013 15:55:49 +0000 (08:55 -0700)]
am
6250f6cb: am
d8151306: Merge "Revert "Add a compatibility symbol for the MemoryBase constructor.""
* commit '
6250f6cb2be039be150de6c836f8595384838342':
Revert "Add a compatibility symbol for the MemoryBase constructor."
Jeff Sharkey [Thu, 14 Mar 2013 15:48:26 +0000 (15:48 +0000)]
am
3fa3e385: am
d77d4e0e: Merge "Support broadcast when dumpstate finishes." into jb-mr2-dev
* commit '
3fa3e38527320e27c40fbcbc3d53ed68b1442e86':
Support broadcast when dumpstate finishes.
Jeff Sharkey [Thu, 14 Mar 2013 15:46:26 +0000 (15:46 +0000)]
am
d77d4e0e: Merge "Support broadcast when dumpstate finishes." into jb-mr2-dev
* commit '
d77d4e0edcb0d0f99dce2acea5278875be0b02a0':
Support broadcast when dumpstate finishes.
Jeff Sharkey [Thu, 14 Mar 2013 15:44:15 +0000 (15:44 +0000)]
Merge "Support broadcast when dumpstate finishes." into jb-mr2-dev
The Android Automerger [Thu, 14 Mar 2013 12:55:37 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Elliott Hughes [Thu, 14 Mar 2013 11:11:37 +0000 (11:11 +0000)]
am
f1d38fb2: am
c47f0988: Revert "Add a compatibility symbol for the MemoryBase constructor."
* commit '
f1d38fb2ff9c11ddc1b0618c90e10abbe43b0939':
Revert "Add a compatibility symbol for the MemoryBase constructor."
Elliott Hughes [Thu, 14 Mar 2013 11:09:19 +0000 (11:09 +0000)]
am
c47f0988: Revert "Add a compatibility symbol for the MemoryBase constructor."
* commit '
c47f0988a36c3032a3c8850c4df3a704dd59e468':
Revert "Add a compatibility symbol for the MemoryBase constructor."
Elliott Hughes [Thu, 14 Mar 2013 02:56:34 +0000 (02:56 +0000)]
Revert "Add a compatibility symbol for the MemoryBase constructor."
Cherry pick from AOSP to fix the build.
See https://android-review.googlesource.com/#/c/53690/
This reverts commit
7f974ff2f317ffbf9256579109f000ec876c3037
Change-Id: I1b123f446d0ff41e11ff81d4ef5f1472b59cac93
Elliott Hughes [Thu, 14 Mar 2013 06:15:23 +0000 (06:15 +0000)]
am
830f71c3: am
5ca39ea5: am
9b57ad73: am
8facd1b2: Merge "Add a compatibility symbol for the MemoryBase constructor."
* commit '
830f71c30ed8d72ef0682c01e9deb6a5284eca9b':
Add a compatibility symbol for the MemoryBase constructor.