OSDN Git Service
Mathias Agopian [Wed, 13 Mar 2013 21:44:30 +0000 (21:44 +0000)]
am
4d9b822e: get rid of ISurface
* commit '
4d9b822e2c18142e55fe2611aa6cd7dc7d4a62c6':
get rid of ISurface
Mathias Agopian [Wed, 13 Mar 2013 00:11:48 +0000 (17:11 -0700)]
get rid of ISurface
ISurface was only used to get the IGraphicBufferProducer from
a Layer. It's now replaced by a BBinder subclass / IBinder and
is only used as a handle to the surface, to both refer to it
and manage its life-time.
Also cleaned-up a bit the ISurfaceComposer interface and
"create layer" code path.
Change-Id: I68d0e02d57b862cffb31d5168c3bc10cea0906eb
Jamie Gennis [Tue, 12 Mar 2013 19:22:52 +0000 (19:22 +0000)]
am
f44e9f91: Merge "atrace: add the webview category" into jb-mr2-dev
* commit '
f44e9f91f37d3fbed64bc952f241d5dc3c385b6a':
atrace: add the webview category
Jamie Gennis [Tue, 12 Mar 2013 19:21:29 +0000 (19:21 +0000)]
Merge "atrace: add the webview category" into jb-mr2-dev
The Android Open Source Project [Tue, 12 Mar 2013 14:14:48 +0000 (07:14 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I31a3e1b1185ded041c4b1dea06da4f2cd87fe21d
The Android Automerger [Tue, 12 Mar 2013 12:55:47 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Mathias Agopian [Tue, 12 Mar 2013 04:35:24 +0000 (04:35 +0000)]
am
f795852b: temporary: enable ASSERTs in RefBase
* commit '
f795852b54b39eb373e0c421b63dc9a98822ac2c':
temporary: enable ASSERTs in RefBase
Mathias Agopian [Tue, 12 Mar 2013 04:27:16 +0000 (21:27 -0700)]
temporary: enable ASSERTs in RefBase
this is in an attempt to get more data on
bug
8328715.
Change-Id: I9333a67c2d7f67f4d9b2fc5eb1ad8a7b2d1c6dcb
Mathias Agopian [Tue, 12 Mar 2013 03:52:42 +0000 (03:52 +0000)]
am
b7a5b05b: Fix missing recents screenshots
* commit '
b7a5b05b53b81cb24849c7e9934c941f64e05a42':
Fix missing recents screenshots
Mathias Agopian [Tue, 12 Mar 2013 03:47:24 +0000 (20:47 -0700)]
Fix missing recents screenshots
We were using the "visible layer list" when taking screenshots,
which doesn't work when a layer is behind other opaque layers
and therefore hidden.
We fix this by using the full layer list, filtered by the
layerstack of the display we're looking at.
Bug:
7552304
Change-Id: I4b6f77e5511aea94f8d218975b6e22738e7e5d5b
Jamie Gennis [Tue, 12 Mar 2013 02:37:53 +0000 (19:37 -0700)]
atrace: add the webview category
Change-Id: Iefb552cd275bb5784903e8bf328890ecd233e45b
Michael Wright [Tue, 12 Mar 2013 01:16:53 +0000 (01:16 +0000)]
am
2aee1b01: Merge "Add TOUCH_NAVIGATION input source" into jb-mr2-dev
* commit '
2aee1b01b7f4e1e0849f5653139a995ad6ba877e':
Add TOUCH_NAVIGATION input source
Michael Wright [Tue, 12 Mar 2013 01:15:48 +0000 (01:15 +0000)]
Merge "Add TOUCH_NAVIGATION input source" into jb-mr2-dev
Mathias Agopian [Tue, 12 Mar 2013 01:13:28 +0000 (01:13 +0000)]
am
d2d5a64a: workaround a deadlock when taking screenshots into a surface
* commit '
d2d5a64aa21cfc548c8c8333d1b36979e5e5a640':
workaround a deadlock when taking screenshots into a surface
Mathias Agopian [Tue, 12 Mar 2013 00:59:59 +0000 (17:59 -0700)]
workaround a deadlock when taking screenshots into a surface
When disconnecting from BufferQueue, we now drain the queue
except the head (which means in the screenshot case we won't
have to block, but we might not have a buffer to show, this
will appear as an error in the log).
Bug:
8362363
Change-Id: If80989aac3c917beea2ebddf3cbb502849d394da
Romain Guy [Mon, 11 Mar 2013 21:39:27 +0000 (21:39 +0000)]
am
dbca4a0e: Merge "Add Thread::isRunning and Condition::signal(WakeUpType)" into jb-mr2-dev
* commit '
dbca4a0ee5dac0b2f8d0ed4b1667adbf11363e35':
Add Thread::isRunning and Condition::signal(WakeUpType)
Romain Guy [Mon, 11 Mar 2013 21:38:26 +0000 (21:38 +0000)]
Merge "Add Thread::isRunning and Condition::signal(WakeUpType)" into jb-mr2-dev
Romain Guy [Mon, 11 Mar 2013 21:34:56 +0000 (14:34 -0700)]
Add Thread::isRunning and Condition::signal(WakeUpType)
The signal() method is useful to choose whether to wake up one or
all threads.
Change-Id: I062ab6d3ddd306a9fb735549ea140e2a76eed75a
Michael Wright [Mon, 11 Mar 2013 21:20:14 +0000 (14:20 -0700)]
Add TOUCH_NAVIGATION input source
Change-Id: Id76e2e85246269ba7b16bb9635e41593b45cac1c
Jean-Baptiste Queru [Mon, 11 Mar 2013 20:49:20 +0000 (20:49 +0000)]
am
5c19de4d: am
1d6e52d1: am
50d36d58: am
75bcd737: am
4ddcb758: (-s ours) am
9ef024ec: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
5c19de4d070dfaebde92a5df4e54c959eef95cba':
Jean-Baptiste Queru [Mon, 11 Mar 2013 20:44:33 +0000 (13:44 -0700)]
am
1d6e52d1: am
50d36d58: am
75bcd737: am
4ddcb758: (-s ours) am
9ef024ec: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
1d6e52d17e2df913e10925c5e3e652d3421ff320':
Jean-Baptiste Queru [Mon, 11 Mar 2013 20:13:37 +0000 (13:13 -0700)]
am
50d36d58: am
75bcd737: am
4ddcb758: (-s ours) am
9ef024ec: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
50d36d58369cdf48bc6fcdba96b36c846be8587a':
Jean-Baptiste Queru [Mon, 11 Mar 2013 20:00:44 +0000 (13:00 -0700)]
am
75bcd737: am
4ddcb758: (-s ours) am
9ef024ec: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
75bcd737770f85114673c4411b8e2ecc0dd32bdf':
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:41:50 +0000 (12:41 -0700)]
am
4ddcb758: (-s ours) am
9ef024ec: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
4ddcb75861cfb2835fcc20f2071222d2f55450ba':
jp abgrall [Mon, 11 Mar 2013 19:34:13 +0000 (19:34 +0000)]
am
574d6902: am
ba8abb51: Merge "Ensure dumpstate children die"
* commit '
574d6902b7e30a1e9c2375481549c8e8a712d6e6':
Ensure dumpstate children die
jp abgrall [Mon, 11 Mar 2013 19:28:06 +0000 (12:28 -0700)]
am
ba8abb51: Merge "Ensure dumpstate children die"
* commit '
ba8abb517d1eddebeda62bf907fa446e3c3b81f6':
Ensure dumpstate children die
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:23:09 +0000 (12:23 -0700)]
am
9ef024ec: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
9ef024ec8ae0318c89cc65dc0591aa40695393fc':
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:19:30 +0000 (12:19 -0700)]
Reconcile with jb-mr1-release - do not merge
jp abgrall [Mon, 11 Mar 2013 18:09:35 +0000 (18:09 +0000)]
Merge "Ensure dumpstate children die"
John Michelau [Thu, 7 Mar 2013 21:35:35 +0000 (15:35 -0600)]
Ensure dumpstate children die
Use prctl(PR_SET_PDEATHSIG, SIGKILL) in each forked child to ensure
it dies when dumpstate dies.
This is important for two cases:
- dumpstate runs a timer for each child process. On expiration, it
sends SIGTERM to kill the process. Sometimes SIGTERM isn't enough
to kill a hung process, so the child lives on.
- When dumpstate is killed by the user before completing, outstanding
children continue to run and generate output.
Change-Id: I96e0dc918c26d56c9fee53611980ba2edd238712
The Android Automerger [Mon, 11 Mar 2013 12:56:07 +0000 (05:56 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Mathias Agopian [Fri, 8 Mar 2013 22:46:55 +0000 (22:46 +0000)]
am
d5776414: make sure to call compositionComplete after taking a screenshot
* commit '
d577641411f067c93aabcd2acf7ce06862fb26d3':
make sure to call compositionComplete after taking a screenshot
Mathias Agopian [Fri, 8 Mar 2013 22:46:54 +0000 (22:46 +0000)]
am
7589b2a7: add two libgui tests
* commit '
7589b2a7975cc3bc2a0659ab6503ceb3e4d94048':
add two libgui tests
Mathias Agopian [Fri, 8 Mar 2013 21:54:46 +0000 (13:54 -0800)]
make sure to call compositionComplete after taking a screenshot
older drivers which are doing implicit synchronization need this
or they could deadlock.
Bug:
8341885
Change-Id: Icd980a6be16071678d6151e34725b3c1c547d7ee
Mathias Agopian [Fri, 8 Mar 2013 21:18:52 +0000 (13:18 -0800)]
add two libgui tests
we check that the order in which we destroy GLConsumer wrt.
releasing the corresponding EGLSurface via eglMake(Un)Current
doesn't leak a buffer.
On at least 2 devices this test doesn't pass.
Change-Id: I63ab83951b4b0a977f38571158f948cbd9dc7cec
Mathias Agopian [Fri, 8 Mar 2013 20:29:52 +0000 (20:29 +0000)]
am
6b2b7009: Merge changes Ibb3b6ff0,I2341e20c into jb-mr2-dev
* commit '
6b2b7009560964ed25cde06602872dff763b09f4':
rename binder services main thread to Binder_*
limit number of extra binder threads in SF to 4
Mathias Agopian [Fri, 8 Mar 2013 20:28:42 +0000 (20:28 +0000)]
Merge changes Ibb3b6ff0,I2341e20c into jb-mr2-dev
* changes:
rename binder services main thread to Binder_*
limit number of extra binder threads in SF to 4
Jesse Hall [Thu, 7 Mar 2013 23:14:18 +0000 (15:14 -0800)]
When disconnecting a surface, cancel don't queue the buffer
This isn't really right either, but avoids having an extra buffer that
the consumer has to drain which it might not be expecting.
To be correct, disconnecting a surface from a context should retain
the current buffer and continue using it when reconnected. The buffer
should only be canceled when the surface is destroyed. That will wait
for a later change.
Bug:
8320762
Change-Id: I5efa39c741193ca4f5612ea9de001ccbb683b345
Jesse Hall [Thu, 7 Mar 2013 17:56:26 +0000 (09:56 -0800)]
Defer destroying surfaces until not current
Bug:
8320762
Change-Id: I1320cf87923bcc5b795a86a13193363a49e29653
Jesse Hall [Thu, 7 Mar 2013 23:47:04 +0000 (23:47 +0000)]
am
49385ec7: Merge "When disconnecting a surface, cancel don\'t queue the buffer" into jb-mr2-dev
* commit '
49385ec7c361347a69245c8a0838f6d03343a1de':
When disconnecting a surface, cancel don't queue the buffer
Jesse Hall [Thu, 7 Mar 2013 23:43:56 +0000 (23:43 +0000)]
Merge "When disconnecting a surface, cancel don't queue the buffer" into jb-mr2-dev
Jesse Hall [Thu, 7 Mar 2013 23:43:35 +0000 (23:43 +0000)]
am
86306b58: Merge "Defer destroying surfaces until not current" into jb-mr2-dev
* commit '
86306b587644e939c5b6d4a53d67c9b74ce24ba5':
Defer destroying surfaces until not current
Jesse Hall [Thu, 7 Mar 2013 23:41:45 +0000 (23:41 +0000)]
Merge "Defer destroying surfaces until not current" into jb-mr2-dev
Mathias Agopian [Thu, 7 Mar 2013 23:34:28 +0000 (15:34 -0800)]
rename binder services main thread to Binder_*
When a binder service's main thread joins the thread pool
it retains its name (whatever the exec name was), which is
very confusing in systrace.
we now rename that thread just like its friends in the
thread pool.
Change-Id: Ibb3b6ff07304b247cfc6fb1694e72350c579513e
Mathias Agopian [Thu, 7 Mar 2013 23:32:47 +0000 (15:32 -0800)]
limit number of extra binder threads in SF to 4
it should be enough and it makes debugging easier.
Bug:
6609290
Change-Id: I2341e20cfcfde184fe1ed9b925215f8fa3481ced
Jesse Hall [Thu, 7 Mar 2013 23:14:18 +0000 (15:14 -0800)]
When disconnecting a surface, cancel don't queue the buffer
This isn't really right either, but avoids having an extra buffer that
the consumer has to drain which it might not be expecting.
To be correct, disconnecting a surface from a context should retain
the current buffer and continue using it when reconnected. The buffer
should only be canceled when the surface is destroyed. That will wait
for a later change.
Bug:
8320762
Change-Id: I5efa39c741193ca4f5612ea9de001ccbb683b345
Jesse Hall [Thu, 7 Mar 2013 17:56:26 +0000 (09:56 -0800)]
Defer destroying surfaces until not current
Bug:
8320762
Change-Id: I1320cf87923bcc5b795a86a13193363a49e29653
Jean-Baptiste Queru [Thu, 7 Mar 2013 20:14:05 +0000 (20:14 +0000)]
am
6c337e7a: resolved conflicts for merge of
bfb2aa46 to jb-mr2-dev
* commit '
6c337e7a663c1049e58e0051bd7bfba61614ef37':
Tweaks for forward compatibility
Jean-Baptiste Queru [Thu, 7 Mar 2013 19:35:19 +0000 (11:35 -0800)]
resolved conflicts for merge of
bfb2aa46 to jb-mr2-dev
Jean-Baptiste Queru [Thu, 7 Mar 2013 19:08:08 +0000 (19:08 +0000)]
Merge "Tweaks for forward compatibility"
Mathias Agopian [Thu, 7 Mar 2013 17:31:05 +0000 (17:31 +0000)]
am
3cd153a0: another attempt to fix the build
* commit '
3cd153a0330d4234a536fc5f4e4346413bde5a44':
another attempt to fix the build
Mathias Agopian [Thu, 7 Mar 2013 17:31:04 +0000 (17:31 +0000)]
am
84b470d7: attempt to fix build
* commit '
84b470d78f10b6fbfbf84edba749e5f7f315fc3a':
attempt to fix build
Mathias Agopian [Thu, 7 Mar 2013 17:30:57 +0000 (17:30 +0000)]
am
1f758231: Merge changes I7f696e42,I51c6df3c into jb-mr2-dev
* commit '
1f758231c26261bd6ef3ec869ce230c06ed5b596':
Make GraphicBuffer a RefBase
Fix RefBase debugging. O_CREAT must specify the mode.
Mathias Agopian [Thu, 7 Mar 2013 17:30:55 +0000 (17:30 +0000)]
am
2be4e8ff: workaround to fix screenshot leak on N4
* commit '
2be4e8ff23f24285f4c195ba5537c7a51c13be4d':
workaround to fix screenshot leak on N4
The Android Automerger [Thu, 7 Mar 2013 13:55:48 +0000 (05:55 -0800)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Mathias Agopian [Thu, 7 Mar 2013 06:37:33 +0000 (22:37 -0800)]
another attempt to fix the build
Change-Id: Ie0245db97170cca9a2cd8783b0fd512daf0d30a6
Mathias Agopian [Thu, 7 Mar 2013 05:34:39 +0000 (21:34 -0800)]
attempt to fix build
Change-Id: Ifb186d2f157ad02f593bf9b681aab53575f183ce
Mathias Agopian [Thu, 7 Mar 2013 04:52:24 +0000 (04:52 +0000)]
Merge changes I7f696e42,I51c6df3c into jb-mr2-dev
* changes:
Make GraphicBuffer a RefBase
Fix RefBase debugging. O_CREAT must specify the mode.
Mathias Agopian [Thu, 7 Mar 2013 04:42:56 +0000 (20:42 -0800)]
workaround to fix screenshot leak on N4
Bug:
8322020
Change-Id: Ie60af0eb431866b8d64b2674ae7bd8b5ee05f5d6
Mathias Agopian [Thu, 7 Mar 2013 02:50:52 +0000 (18:50 -0800)]
Make GraphicBuffer a RefBase
- this gives us access to RefBase's refcounting debugging
- it doesn't cost much because GraphicBuffer already has a vtable
Change-Id: I7f696e421fea14b14bfaeb83880689b83e96af4d
Mathias Agopian [Thu, 7 Mar 2013 01:51:15 +0000 (17:51 -0800)]
Fix RefBase debugging. O_CREAT must specify the mode.
Change-Id: I51c6df3cfd59b20ca73c3edee86bc2f74dbde1b1
Mathias Agopian [Thu, 7 Mar 2013 01:49:25 +0000 (01:49 +0000)]
am
438ca07b: Merge changes I66511c08,Ia051949f,Ic7451365,I5b571a4c into jb-mr2-dev
* commit '
438ca07b6ba74235e87bfbd78c94874d8bbde391':
Get rid of LayerBase.
Make LayerDim a regular Layer instead of a LayerBase
fold LayerBaseClient into LayerBase
Remove support for ScreenshotLayer
Mathias Agopian [Thu, 7 Mar 2013 01:47:34 +0000 (01:47 +0000)]
Merge changes I66511c08,Ia051949f,Ic7451365,I5b571a4c into jb-mr2-dev
* changes:
Get rid of LayerBase.
Make LayerDim a regular Layer instead of a LayerBase
fold LayerBaseClient into LayerBase
Remove support for ScreenshotLayer
Jean-Baptiste Queru [Wed, 6 Mar 2013 23:04:42 +0000 (15:04 -0800)]
Tweaks for forward compatibility
Change-Id: I136fcbbc14072ee5f5281d09445f28d083ed3ce1
Jeff Sharkey [Wed, 6 Mar 2013 16:47:57 +0000 (16:47 +0000)]
am
175264b0: Return NO_MEMORY when glReadPixels() fails.
* commit '
175264b09c6080b29a23fc9f545d4b99445714bd':
Return NO_MEMORY when glReadPixels() fails.
The Android Automerger [Wed, 6 Mar 2013 13:56:13 +0000 (05:56 -0800)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Mathias Agopian [Wed, 6 Mar 2013 01:47:11 +0000 (17:47 -0800)]
Get rid of LayerBase.
The functionality of LayerBase and Layer is folded
into Layer. There wasn't a need for this abstraction
anymore.
Change-Id: I66511c08cc3d89009ba4deabf47e26cd4cfeaefb
Mathias Agopian [Tue, 5 Mar 2013 23:50:58 +0000 (15:50 -0800)]
Make LayerDim a regular Layer instead of a LayerBase
this is in preparation to get rid of LayerBase entirely
Change-Id: Ia051949fc5205fd87371331145356ee11598a597
Mathias Agopian [Tue, 5 Mar 2013 23:14:58 +0000 (15:14 -0800)]
fold LayerBaseClient into LayerBase
Change-Id: Ic745136522df59c42f0885fd969e75ea55d09f01
Mathias Agopian [Tue, 5 Mar 2013 22:51:39 +0000 (14:51 -0800)]
Remove support for ScreenshotLayer
Change-Id: I5b571a4cf3faa77d2c4aca916fa4bd00a1065bb9
Jeff Sharkey [Wed, 6 Mar 2013 01:57:26 +0000 (17:57 -0800)]
Return NO_MEMORY when glReadPixels() fails.
Change-Id: Ic66134ef457e8442ae9135e9ec50e3d02932a253
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: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:53:32 +0000 (07:53 -0800)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I7bb6b77ca42a715a6eb69081512c43a43158e1e3
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: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: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: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: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:06:47 +0000 (11:06 -0800)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I8176eb9302e58477ef1bd9b394a974d85fa67792
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 [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
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: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."
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
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