Mathias Agopian
9b1eda7efa
am d7932a62
: am 48be3232
: Merge "make sure to update the "current state" when we "fake" the transaction" into jb-mr2-dev
...
* commit 'd7932a62d091df1559a47004670a951d8ab9c7f1':
make sure to update the "current state" when we "fake" the transaction
2013-04-12 18:05:40 -07:00
Jaikumar Ganesh
e53f19610c
am e4f0dc30
: am 2ea0c67d
: Merge "Sensor changes." into jb-mr2-dev
...
* commit 'e4f0dc300a22dbcd9081558d2844c6062b4cd380':
Sensor changes.
2013-04-12 18:05:35 -07:00
Mathias Agopian
d7932a62d0
am 48be3232
: Merge "make sure to update the "current state" when we "fake" the transaction" into jb-mr2-dev
...
* commit '48be323236f9fc41620a17e182eea800351812c5':
make sure to update the "current state" when we "fake" the transaction
2013-04-12 17:32:30 -07:00
Mathias Agopian
48be323236
Merge "make sure to update the "current state" when we "fake" the transaction" into jb-mr2-dev
2013-04-13 00:27:32 +00:00
Jaikumar Ganesh
e4f0dc300a
am 2ea0c67d
: Merge "Sensor changes." into jb-mr2-dev
...
* commit '2ea0c67da6770a840d871a69c61bb52d73dadf2b':
Sensor changes.
2013-04-12 17:25:38 -07:00
Jaikumar Ganesh
2ea0c67da6
Merge "Sensor changes." into jb-mr2-dev
2013-04-13 00:22:39 +00:00
Dianne Hackborn
55821ac6d3
am 0c71bb90
: am 9380d78c
: Add new resources trace.
...
* commit '0c71bb90f96f485940fd3b73c307fedee958042d':
Add new resources trace.
2013-04-12 17:10:04 -07:00
Dianne Hackborn
0c71bb90f9
am 9380d78c
: Add new resources trace.
...
* commit '9380d78c98d8b8fbce9ade5881fab7134fadc015':
Add new resources trace.
2013-04-12 17:06:29 -07:00
Dianne Hackborn
9380d78c98
Add new resources trace.
...
Change-Id: Iab8c1ef51f491e818fb4bab0ba7a042f0d9bec9a
2013-04-12 16:58:24 -07:00
Mathias Agopian
6c67f0fe45
make sure to update the "current state" when we "fake" the transaction
...
this mimics the code we used for the size. basically we need to
also update the "current state" because it gets copied to the
"drawing state" when a transaction occurs, and it would
"undo" our change.
Bug: 8511430
Bug: 8581533
Change-Id: I08c02abbf21b7f168f7124cd14ee717d7d3d502c
2013-04-12 16:58:11 -07:00
Jaikumar Ganesh
4342fdf14f
Sensor changes.
...
1. Some sensors can wake up the AP. Add wakelocks.
2. Handle backward compatibility for rotation vector
heading accuracy.
3. Cleanup auto disabled sensors.
4. Fix race condition between enable and dispatch.
Change-Id: I39dddf12e208d83cd288201986ee994312555820
2013-04-12 09:34:44 -07:00
Chet Haase
46c0909782
am 27ff54db
: am 5e5bed60
: Merge "DO NOT MERGE Make sure surfaces always have latest orientation info" into jb-mr2-dev
...
* commit '27ff54dbb4089626f694339ee0f54c38b8688537':
DO NOT MERGE Make sure surfaces always have latest orientation info
2013-04-12 07:16:28 -07:00
Chet Haase
27ff54dbb4
am 5e5bed60
: Merge "DO NOT MERGE Make sure surfaces always have latest orientation info" into jb-mr2-dev
...
* commit '5e5bed60d03b5556ada351b010ed14ae8f1515ae':
DO NOT MERGE Make sure surfaces always have latest orientation info
2013-04-12 07:13:55 -07:00
Chet Haase
5e5bed60d0
Merge "DO NOT MERGE Make sure surfaces always have latest orientation info" into jb-mr2-dev
2013-04-12 14:11:54 +00:00
Mathias Agopian
e3b90bbd82
am 5297a0a2
: am 453cfe0b
: Merge "Improve screenshot performance on some devices (DO NOT MERGE)" into jb-mr2-dev
...
* commit '5297a0a2093c7908488b172855619bc6763526e3':
Improve screenshot performance on some devices (DO NOT MERGE)
2013-04-11 20:25:53 -07:00
Mathias Agopian
5297a0a209
am 453cfe0b
: Merge "Improve screenshot performance on some devices (DO NOT MERGE)" into jb-mr2-dev
...
* commit '453cfe0bfe06f3cbd87c8c42fa641756ab466b06':
Improve screenshot performance on some devices (DO NOT MERGE)
2013-04-11 20:22:23 -07:00
Mathias Agopian
453cfe0bfe
Merge "Improve screenshot performance on some devices (DO NOT MERGE)" into jb-mr2-dev
2013-04-12 03:18:17 +00:00
Mathias Agopian
180f10de6f
Improve screenshot performance on some devices (DO NOT MERGE)
...
this affects devices that need a glReadPixels(). We use
a FBO instead of a GlConsumer as an intermediate render target, this
saves 2 calls to eglMakeCurrent().
On Galaxy Nexus this allows us to go from ~135ms to ~35ms for
recent's screenshots.
Bug: 8582615
Change-Id: I6b25291ecc235f1927579bbb2db3c731e985c6e8
2013-04-11 17:35:24 -07:00
Chet Haase
91d25932b6
DO NOT MERGE Make sure surfaces always have latest orientation info
...
When the screen is turned off, the current stack is set to -1. This causes
logic in iSurfaceFlinger's handleTransactionLocked() function to fail to
match the current stack, and the latest orientation is not set into the
layer. This causes BufferQueue, later, to potentially set an obsolete
transformHint on a created surface (such as in the case with ImageWallpaper's
Egl surface, in the bug below).
The fix is to note this situation and use a default value for the DisplayDevice,
which should have the current orientation information.
Issue #8508397 ImageWallpaper sometimes rendered in wrong orientation causing a ~30-40% drop in graphics performance
Change-Id: Ibae15d73b289a8343c67f4f6bb77fdf11dd95ee7
2013-04-11 17:06:38 -07:00
Rom Lemarchand
1bc7e2f6dd
Add support for OMX_QCOM_COLOR_FormatYUV420PackedSemiPlanar32m color format
...
Change-Id: I9392eb961ec92d4d778573b7a142344e552c80d6
2013-04-11 10:30:27 -07:00
Andy McFadden
91f056e4a9
am 12ff91b0
: am 53dc9044
: Merge "Updated comments" into jb-mr2-dev
...
* commit '12ff91b05a055e6adffaad9bf7661a5d251c5b6c':
Updated comments
2013-04-11 10:23:27 -07:00
Andy McFadden
12ff91b05a
am 53dc9044
: Merge "Updated comments" into jb-mr2-dev
...
* commit '53dc9044bfe17039592faf4660c5bf715e8120ad':
Updated comments
2013-04-11 10:20:26 -07:00
Andy McFadden
53dc9044bf
Merge "Updated comments" into jb-mr2-dev
2013-04-11 17:15:52 +00:00
The Android Open Source Project
4597de963f
am 6a92b35e
: Reconcile with jb-mr2-release - do not merge
...
* commit '6a92b35e3a64c90127fb87530c50e9a04a61c671':
2013-04-11 07:47:08 -07:00
The Android Open Source Project
6a92b35e3a
Reconcile with jb-mr2-release - do not merge
...
Change-Id: If9501b8a4f0e4a1d6dc787c71457814360d11d2b
2013-04-11 07:45:13 -07:00
The Android Automerger
6bd8dee87e
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-11 05:55:37 -07:00
Mathias Agopian
a53e665dac
am f30501e1
: am d19e519f
: Merge "fix another bug where screenshots could end-up all black" into jb-mr2-dev
...
* commit 'f30501e1e280e8b5637430ac2be79235ee16d018':
fix another bug where screenshots could end-up all black
2013-04-10 21:49:51 -07:00
Mathias Agopian
f30501e1e2
am d19e519f
: Merge "fix another bug where screenshots could end-up all black" into jb-mr2-dev
...
* commit 'd19e519f673adcc5d12fcca549e577eea74f31aa':
fix another bug where screenshots could end-up all black
2013-04-10 21:46:12 -07:00
Mathias Agopian
d19e519f67
Merge "fix another bug where screenshots could end-up all black" into jb-mr2-dev
2013-04-11 04:43:49 +00:00
Mathias Agopian
9eb1f0558b
fix another bug where screenshots could end-up all black
...
SF transactions were always handled on VSYNC which allowed
the screenshot to sneak-in between closing the transaction
and vsync (before it's latched), resulting in a screenshot
with the previous state.
we now always force transactions to happen immediately
before screenhots.
Bug: 7552304
Change-Id: I0afc86b7e8366173daff5b9988bbb4d2a0f43860
2013-04-10 16:27:17 -07:00
The Android Open Source Project
f446b1af27
am e1b8a7fc
: Reconcile with jb-mr2-release - do not merge
...
* commit 'e1b8a7fcee9a193bf01f0842b0aca35b27bf0c16':
2013-04-10 10:08:24 -07:00
The Android Open Source Project
e1b8a7fcee
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I968ec2bb02006948c3f24c449d2a79a0e2f799f9
2013-04-10 10:05:42 -07:00
The Android Automerger
6152fd2c0e
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-10 05:56:11 -07:00
Ying Wang
63e13c8545
am 46f19772
: resolved conflicts for merge of c76e8a20
to jb-mr2-dev-plus-aosp
...
* commit '46f19772ae5659c1659a0ac8f1f72389e94a85d4':
Add liblog
2013-04-09 22:33:16 -07:00
Ying Wang
46f19772ae
resolved conflicts for merge of c76e8a20
to jb-mr2-dev-plus-aosp
...
Change-Id: I895a8ad8c936a80c70aaac739c6441d3c7c55834
2013-04-09 22:27:50 -07:00
Ying Wang
c76e8a20e2
Merge "Add liblog" into jb-mr2-dev
2013-04-10 05:17:07 +00:00
Ying Wang
8a0cb4ee0b
Add liblog
...
Bug: 8580410
Change-Id: I2ca4fa00dde0b574df3619134836bcb9315bd506
2013-04-09 21:55:39 -07:00
Jamie Gennis
e3808ed677
am 13c9a949
: am 8758a3e3
: Merge changes I82e361a6,I83694682 into jb-mr2-dev
...
* commit '13c9a949b5d74f36edbdbfda764fe554cdbaefa9':
libgui_test: increase the tolerance for a YUV test
libgui: fix an EGLImage leak
2013-04-09 14:49:54 -07:00
Jamie Gennis
13c9a949b5
am 8758a3e3
: Merge changes I82e361a6,I83694682 into jb-mr2-dev
...
* commit '8758a3e3941bae9ef11948506950521c4682acf1':
libgui_test: increase the tolerance for a YUV test
libgui: fix an EGLImage leak
2013-04-09 14:46:21 -07:00
Jamie Gennis
8758a3e394
Merge changes I82e361a6,I83694682 into jb-mr2-dev
...
* changes:
libgui_test: increase the tolerance for a YUV test
libgui: fix an EGLImage leak
2013-04-09 21:43:20 +00:00
Jamie Gennis
e6a0f5028b
libgui_test: increase the tolerance for a YUV test
...
This change increases the pixel difference tolerance of the
SurfaceTextureGLTest.TexturingFromCpuFilledYV12BufferNpot test from 2 to 3.
Bug: 8349135
Change-Id: I82e361a689335f49065cacd8a3fc145d67b125f1
2013-04-08 14:42:22 -07:00
Jamie Gennis
ad669b04f4
libgui: fix an EGLImage leak
...
This moves the call to ConsumerBase::abandon from the ConsumerBase dtor to
ConsumerBase::onLastStrongRef. The abandon call relies on virtual methods to
perform the clean-up, so calling it from the ConsumerBase dtor after the
derived classes dtors ran was skipping some of the clean-up. The
onLastStrongRef method should get called just before the most derived class's
dtor gets called.
Bug: 8349135
Change-Id: I836946826927cc1ed69c049049f525f92b17a269
2013-04-08 14:42:22 -07:00
The Android Open Source Project
a776b9906e
am ecef1c1a
: Reconcile with jb-mr2-release - do not merge
...
* commit 'ecef1c1a31619782737230b5fd45718f20760ca9':
2013-04-08 13:40:32 -07:00
The Android Open Source Project
ecef1c1a31
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I2e2b858b5fee36a390f92f657a171d2898ae9810
2013-04-08 13:36:03 -07:00
The Android Automerger
e675893cf1
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-08 05:56:23 -07:00
Jesse Hall
528681d760
am ff080169
: am 1df59c93
: Merge "Tell HWComposer the dimensions of virtual displays" into jb-mr2-dev
...
* commit 'ff08016919e2c0508501faede26fda6dca833094':
Tell HWComposer the dimensions of virtual displays
2013-04-05 20:40:22 -07:00
Jesse Hall
4f7acbd522
am 46ab373f
: am d5e345b0
: Merge "Actually set the virtual display output buffer." into jb-mr2-dev
...
* commit '46ab373f1f394ec50e38381cb98d3976fe87a9bb':
Actually set the virtual display output buffer.
2013-04-05 20:40:21 -07:00
Jesse Hall
ff08016919
am 1df59c93
: Merge "Tell HWComposer the dimensions of virtual displays" into jb-mr2-dev
...
* commit '1df59c93fea8bec21b8084c34aface086f1e0896':
Tell HWComposer the dimensions of virtual displays
2013-04-05 20:37:13 -07:00
Jesse Hall
46ab373f1f
am d5e345b0
: Merge "Actually set the virtual display output buffer." into jb-mr2-dev
...
* commit 'd5e345b0cf5c1c5aaa5c10a1a4c759e74d77fb37':
Actually set the virtual display output buffer.
2013-04-05 20:37:13 -07:00
Jesse Hall
1df59c93fe
Merge "Tell HWComposer the dimensions of virtual displays" into jb-mr2-dev
2013-04-06 03:32:19 +00:00