Andy McFadden
9c8b3097e6
am af4ae923
: am 6410c8c4
: Merge "Use black for blackout layer" into klp-dev
...
* commit 'af4ae923c3f8a2e40d74eb6291da16b4a6514449':
Use black for blackout layer
2013-10-14 10:48:32 -07:00
Andy McFadden
af4ae923c3
am 6410c8c4
: Merge "Use black for blackout layer" into klp-dev
...
* commit '6410c8c4097f1a3246aa3d03b3291d47f982bc4b':
Use black for blackout layer
2013-10-11 14:47:25 -07:00
Andy McFadden
6410c8c409
Merge "Use black for blackout layer" into klp-dev
2013-10-11 21:39:49 +00:00
Andy McFadden
c6f2169559
Use black for blackout layer
...
SurfaceFlinger was rendering dark purple for secure content, which
showed up when we took a screen shot for the orientation change
animation. Use black instead.
Bug 11157921
Change-Id: I3895e8168891d49dc5b84eed599bcd0a303bb70a
2013-10-11 11:16:03 -07:00
Dave Burke
218566c303
am 06c964d9
: am 9c0dfa09
: Merge "Eliminate latency when resampling is disabled" into klp-dev
...
* commit '06c964d9b31ac81d3521f97427cdab77ee7d1cff':
Eliminate latency when resampling is disabled
2013-10-10 19:41:28 -07:00
Dave Burke
06c964d9b3
am 9c0dfa09
: Merge "Eliminate latency when resampling is disabled" into klp-dev
...
* commit '9c0dfa09731a8366a7cdcd7171dde64b73af0d5c':
Eliminate latency when resampling is disabled
2013-10-10 19:39:05 -07:00
Dave Burke
9c0dfa0973
Merge "Eliminate latency when resampling is disabled" into klp-dev
2013-10-11 02:33:15 +00:00
Aravind Akella
4a1e00fb3a
am 1f1e5768
: am 5d6aa951
: Merge "Change API from flush(handle) to flush(). Call flush on all active sensors in the given SensorEventConnection." into klp-dev
...
* commit '1f1e576840d5b36a091368abb6fe6610384b6449':
Change API from flush(handle) to flush(). Call flush on all active sensors in the given SensorEventConnection.
2013-10-10 19:26:34 -07:00
Aravind Akella
1f1e576840
am 5d6aa951
: Merge "Change API from flush(handle) to flush(). Call flush on all active sensors in the given SensorEventConnection." into klp-dev
...
* commit '5d6aa95129a13aae37a60b3e4246a0592dab396d':
Change API from flush(handle) to flush(). Call flush on all active sensors in the given SensorEventConnection.
2013-10-10 19:21:05 -07:00
Aravind Akella
5d6aa95129
Merge "Change API from flush(handle) to flush(). Call flush on all active sensors in the given SensorEventConnection." into klp-dev
2013-10-11 02:05:41 +00:00
Michael Wright
ad526f8505
Eliminate latency when resampling is disabled
...
Since the latency was introduced to avoid egregious errors during
resampling, remove it when we aren't resampling.
Change-Id: Ia8e9a9afb1e16212fec81a8c9c661c598e1b0ebf
2013-10-10 18:54:12 -07:00
Jesse Hall
19cd5bc78c
am 8c76d2a1
: am 5c65efe2
: Merge "Wake up disp sync thread when setting display period" into klp-dev
...
* commit '8c76d2a16ede579fd2069647ff73591bb6d6a235':
Wake up disp sync thread when setting display period
2013-10-10 16:08:22 -07:00
Jesse Hall
8c76d2a16e
am 5c65efe2
: Merge "Wake up disp sync thread when setting display period" into klp-dev
...
* commit '5c65efe2b1d632226f02751e6b1d3cfd7c8ecb26':
Wake up disp sync thread when setting display period
2013-10-10 16:05:37 -07:00
Jesse Hall
5c65efe2b1
Merge "Wake up disp sync thread when setting display period" into klp-dev
2013-10-10 22:24:32 +00:00
Jesse Hall
72f69d9f23
Wake up disp sync thread when setting display period
...
Bug: 10624956
Change-Id: I272c15f319521bfbd1bb70451366c7dd84d60bf9
2013-10-10 14:48:22 -07:00
Andy McFadden
95e4a7d9f3
am c00ab7b5
: am 2d8d120d
: Fix blank / partial screenshots
...
* commit 'c00ab7b5aafb7625ad7ebd2af107936df3efc98b':
Fix blank / partial screenshots
2013-10-10 08:38:36 -07:00
Andy McFadden
c00ab7b5aa
am 2d8d120d
: Fix blank / partial screenshots
...
* commit '2d8d120dc175c131a75e93fb1de61a9f432ddce9':
Fix blank / partial screenshots
2013-10-10 08:23:01 -07:00
Aravind Akella
701166d9f6
Change API from flush(handle) to flush(). Call flush on all active sensors in the given SensorEventConnection.
...
Change-Id: I4ef2bec80406c517903ab9782dc9eaf3fa8b7f36
2013-10-09 17:26:01 -07:00
Andy McFadden
2d8d120dc1
Fix blank / partial screenshots
...
The screen capture code wasn't waiting for the render to finish,
so sometimes you'd see an empty or partial image.
Bug 11131777
Change-Id: Ic64087322ce3bb15bb5f4fb1eb07579880fe6197
2013-10-09 16:38:02 -07:00
Ed Heyl
a030611c6b
am 6589a42c
: am 98c197d8
: merge in KQS81M
...
* commit '6589a42c0d7e6062f158b46829c71b092869cc44':
GLConsumer: Add query for current frame number.
Disable GLES 2.x rendering
Initialize mIndent
2013-10-09 09:12:50 -07:00
Jamie Gennis
b85d2cf0a2
resolved conflicts for merge of 790b6d09
to master
2013-10-08 17:50:36 -07:00
Ed Heyl
6589a42c0d
am 98c197d8
: merge in KQS81M
...
* commit '98c197d826f95a82de41e16350f58a70a7ad23c6':
GLConsumer: Add query for current frame number.
Disable GLES 2.x rendering
Initialize mIndent
2013-10-08 15:57:56 -07:00
Ed Heyl
98c197d826
merge in KQS81M
2013-10-08 15:40:38 -07:00
Jamie Gennis
790b6d092c
am faf77cce
: SurfaceFlinger: SW-based vsync events
...
* commit 'faf77cce9d9ec0238d6999b3bd0d40c71ff403c5':
SurfaceFlinger: SW-based vsync events
2013-10-08 15:17:12 -07:00
Jamie Gennis
faf77cce9d
SurfaceFlinger: SW-based vsync events
...
This change adds the DispSync class, which models the hardware vsync event
times to allow vsync event callbacks to be done at an arbitrary phase offset
from the hardware vsync. This can be used to reduce the minimum latency from
Choreographer wake-up to on-screen image presentation.
Bug: 10624956
Change-Id: I8c7a54ceacaa4d709726ed97b0dcae4093a7bdcf
2013-10-07 17:59:53 -07:00
Alex Ray
192b7fa028
am 859d1e49
: am d457ec52
: Add feature android.hardware.consumerir xml file
...
* commit '859d1e490bcf07be9353a0e6c26264ef38fe0610':
Add feature android.hardware.consumerir xml file
2013-10-04 14:21:17 -07:00
Alex Ray
859d1e490b
am d457ec52
: Add feature android.hardware.consumerir xml file
...
* commit 'd457ec52d7023e9a6112f313cd2bf94293162214':
Add feature android.hardware.consumerir xml file
2013-10-04 14:18:35 -07:00
Marco Nelissen
0e6e912b54
am e71575be
: am 48d3741b
: Merge "Allow blaming a single uid for work done" into klp-dev
...
* commit 'e71575bed44fbbd61b6a369d42e200c0141953be':
Allow blaming a single uid for work done
2013-10-04 11:09:01 -07:00
Lajos Molnar
86f76208f0
am 04e6ab6e
: am b1f94ef3
: Merge "media/hardware/HardwareAPI.h: Added PrepareForAdaptivePlaybackParams" into klp-dev
...
* commit '04e6ab6e27c39604a7029467161a90af78ecdf07':
media/hardware/HardwareAPI.h: Added PrepareForAdaptivePlaybackParams
2013-10-04 11:09:01 -07:00
Alan Viverette
794c5ba973
Simplify color adjustment using homogeneous coordinates
...
Change-Id: Ie31abacb134c29d82a6041fa7d521f68a1a273af
2013-10-03 16:40:52 -07:00
Marco Nelissen
e71575bed4
am 48d3741b
: Merge "Allow blaming a single uid for work done" into klp-dev
...
* commit '48d3741ba5f4b3bb411ee5c083a11f4f52f9e907':
Allow blaming a single uid for work done
2013-10-03 15:40:30 -07:00
Lajos Molnar
04e6ab6e27
am b1f94ef3
: Merge "media/hardware/HardwareAPI.h: Added PrepareForAdaptivePlaybackParams" into klp-dev
...
* commit 'b1f94ef3f97bd20b928cf980791526861650eab9':
media/hardware/HardwareAPI.h: Added PrepareForAdaptivePlaybackParams
2013-10-03 15:40:30 -07:00
Alex Ray
d457ec52d7
Add feature android.hardware.consumerir xml file
...
Bug: 10676690
Change-Id: I2cc62b9c97a71588c43ff96ca38d470976bde9b0
2013-10-03 13:09:37 -07:00
Mike Lockwood
59d6992f4d
Fix the build
...
Change-Id: I73f1c2e9e2e565602aa78b51a2cea2d619d7b0e9
2013-10-03 11:14:09 -07:00
Mike Lockwood
f99ad113b9
Move libandroidfw from frameworks/base
...
Change-Id: I8228c9a796e68e920c6a7dfc154c4b70ba66b082
2013-10-03 10:29:39 -07:00
Marco Nelissen
48d3741ba5
Merge "Allow blaming a single uid for work done" into klp-dev
2013-10-03 16:34:51 +00:00
Lajos Molnar
b1f94ef3f9
Merge "media/hardware/HardwareAPI.h: Added PrepareForAdaptivePlaybackParams" into klp-dev
2013-10-03 16:10:25 +00:00
Marco Nelissen
9a7706bb17
Allow blaming a single uid for work done
...
This lets audioflinger assign blame for wakelocks to a single uid.
Currently this is only used for recording wakelocks.
b/10985160
Change-Id: Idc9adb22c29030010ac690d4cb95e7e7ea6b91e6
2013-10-03 08:49:07 -07:00
Jamie Gennis
bd381c6164
am 6be1d210
: am f0cf5f10
: BufferQueue: fix a test crash
...
* commit '6be1d210eef392f5745d58a0033572b1af4b2f2a':
BufferQueue: fix a test crash
2013-10-02 11:19:52 -07:00
Jamie Gennis
6be1d210ee
am f0cf5f10
: BufferQueue: fix a test crash
...
* commit 'f0cf5f103cf9c54d59de4ed6f1d8ddd2302dec1b':
BufferQueue: fix a test crash
2013-10-02 11:16:59 -07:00
Jamie Gennis
f0cf5f103c
BufferQueue: fix a test crash
...
Bug: 10935880
Change-Id: If76e9fb055103bad0db7e6c16487532671573149
2013-10-02 18:02:28 +00:00
Jamie Gennis
4e8fd6f30d
am 886b1521
: am a9c47f32
: Merge "GLConsumer: start using EGL_ANDROID_image_crop" into klp-dev
...
* commit '886b152111cc13dcfe1b47724f5e496f12ccc420':
GLConsumer: start using EGL_ANDROID_image_crop
2013-10-02 10:44:44 -07:00
Dave Burke
c5214289d6
am 9b4b1180
: am 06993503
: Merge "only clear FB when asked for the opaque layer" into klp-dev
...
* commit '9b4b1180941f4d2ef9d3e7bd26bc1855ff9fb141':
only clear FB when asked for the opaque layer
2013-10-02 10:44:44 -07:00
Jamie Gennis
886b152111
am a9c47f32
: Merge "GLConsumer: start using EGL_ANDROID_image_crop" into klp-dev
...
* commit 'a9c47f327373cbe48e187442c7f9554d24a75c08':
GLConsumer: start using EGL_ANDROID_image_crop
2013-10-02 10:41:58 -07:00
Dave Burke
9b4b118094
am 06993503
: Merge "only clear FB when asked for the opaque layer" into klp-dev
...
* commit '0699350336cccc244bb6c52a0d910f9599253812':
only clear FB when asked for the opaque layer
2013-10-02 10:41:57 -07:00
Jamie Gennis
a9c47f3273
Merge "GLConsumer: start using EGL_ANDROID_image_crop" into klp-dev
2013-10-02 17:36:48 +00:00
Dave Burke
0699350336
Merge "only clear FB when asked for the opaque layer" into klp-dev
2013-10-02 17:36:40 +00:00
Jamie Gennis
dbe9245e2e
GLConsumer: start using EGL_ANDROID_image_crop
...
This change makes GLConsumer use the EGL_ANDROID_image_crop extension when
available on a device. The crop rectangle is passed to the EGL driver when
creating EGLImages, allowing the crop to be performed by the driver rather than
using the texture transform matrix.
Bug: 10897141
Change-Id: I63e9a5d5c85067376abc420e3639154468346311
2013-10-02 17:34:35 +00:00
Jesse Hall
fee52e20b9
am f3fa0712
: am 93573e91
: Merge "Treat composition frames with no layers as using GLES composition" into klp-dev
...
* commit 'f3fa0712282e760c316f44cba05f884f9399b98f':
Treat composition frames with no layers as using GLES composition
2013-10-02 09:57:03 -07:00
Jesse Hall
10a9ca1c69
am 72d270c5
: am b716e570
: Set the outbuf acquire fence after we actually have it.
...
* commit '72d270c5f0918d1dc7a6a1774b80469c9f28b7ea':
Set the outbuf acquire fence after we actually have it.
2013-10-02 09:57:02 -07:00