OSDN Git Service
Michael Wright [Tue, 22 Oct 2013 00:30:25 +0000 (17:30 -0700)]
am
47f0b989: am
3223217a: Only consume touches up until the frame time
* commit '
47f0b9894b78a76a1257e0f3299cbe5446035c09':
Only consume touches up until the frame time
Michael Wright [Tue, 22 Oct 2013 00:26:57 +0000 (00:26 +0000)]
Merge "Add MAX_CONTROLLER_LEDS constant"
Michael Wright [Tue, 22 Oct 2013 00:23:55 +0000 (17:23 -0700)]
am
3223217a: Only consume touches up until the frame time
* commit '
3223217aed6dcfa55b5b952cd6be71f70e41ba63':
Only consume touches up until the frame time
Michael Wright [Mon, 21 Oct 2013 19:05:22 +0000 (12:05 -0700)]
Only consume touches up until the frame time
When resampling is disabled, it's currently possible to consume
touches after the current frame time. This breaks some guarantees and
could cause unexpected behaviors.
Change-Id: I99908a2cac2df9f795dd4a07188b4451213cf3e4
Michael Wright [Sat, 19 Oct 2013 00:53:50 +0000 (17:53 -0700)]
Add MAX_CONTROLLER_LEDS constant
Change-Id: I5ec972338c50647049bb5a8279847d54a84d9f70
Andy McFadden [Sat, 19 Oct 2013 00:00:26 +0000 (17:00 -0700)]
am
251b11c2: am
85075869: Wait for buffers to drain
* commit '
251b11c2045b2ae97f2ab270a65e11b4ca49b1b6':
Wait for buffers to drain
Andy McFadden [Fri, 18 Oct 2013 23:57:01 +0000 (16:57 -0700)]
am
85075869: Wait for buffers to drain
* commit '
8507586903fa803abf535853a169913f2cf2e555':
Wait for buffers to drain
Andy McFadden [Fri, 18 Oct 2013 22:50:24 +0000 (15:50 -0700)]
Wait for buffers to drain
When a BufferQueue producer disconnects and reconnects, we retain
the previously-queued buffers but empty the slots. This allows
the number of queued buffers to grow without limit. The low-memory
killer does not approve.
Bug
11069934
Change-Id: Ia2eaa954c7a3904b54209a3701dba01689e204d8
Michael Wright [Fri, 18 Oct 2013 20:02:59 +0000 (20:02 +0000)]
Merge "Parse LED mappings in keylayout files"
Michael Wright [Fri, 18 Oct 2013 00:35:53 +0000 (17:35 -0700)]
Parse LED mappings in keylayout files
Change-Id: I6bc3760341868015f054d9866e2616a312da94e0
Marco Nelissen [Fri, 18 Oct 2013 14:28:55 +0000 (14:28 +0000)]
Merge "Native counterpart of new power manager method"
Ed Heyl [Thu, 17 Oct 2013 01:02:04 +0000 (18:02 -0700)]
am
afd0debe: am
dacd4159: merge in klp-release (no-op)
* commit '
afd0debe4bdf47dc0f968282ca1261842bb65d60':
Change API from flush(handle) to flush(). Call flush on all active sensors in the given SensorEventConnection.
Eliminate latency when resampling is disabled
Fix blank / partial screenshots
Set the outbuf acquire fence after we actually have it.
only clear FB when asked for the opaque layer
Treat composition frames with no layers as using GLES composition
Fix two EGLConfig selection bugs
fix crashers with wifi/virtual displays
Ed Heyl [Thu, 17 Oct 2013 00:56:33 +0000 (17:56 -0700)]
am
dacd4159: merge in klp-release (no-op)
* commit '
dacd4159631865da1a02203fe5fa7c5f1339cda9':
Change API from flush(handle) to flush(). Call flush on all active sensors in the given SensorEventConnection.
Eliminate latency when resampling is disabled
Fix blank / partial screenshots
Set the outbuf acquire fence after we actually have it.
only clear FB when asked for the opaque layer
Treat composition frames with no layers as using GLES composition
Fix two EGLConfig selection bugs
fix crashers with wifi/virtual displays
Ed Heyl [Thu, 17 Oct 2013 00:43:06 +0000 (17:43 -0700)]
merge in klp-release (no-op)
Marco Nelissen [Wed, 16 Oct 2013 17:57:51 +0000 (10:57 -0700)]
Native counterpart of new power manager method
Change-Id: I54c0ed50a57ac870da91db8589a73a2c792dbd8d
The Android Automerger [Wed, 16 Oct 2013 04:14:09 +0000 (21:14 -0700)]
merge in klp-release history after reset to klp-dev
Jamie Gennis [Wed, 16 Oct 2013 00:29:21 +0000 (17:29 -0700)]
am
bbfbe93c: am
0a645cc5: SurfaceFlinger: give SF its own vsync phase
* commit '
bbfbe93c0d2d6c7818e23219d2925f02ddf5bd92':
SurfaceFlinger: give SF its own vsync phase
Jamie Gennis [Wed, 16 Oct 2013 00:29:21 +0000 (17:29 -0700)]
am
47c772e8: am
d1700756: SurfaceFlinger: Add EventControlThread
* commit '
47c772e8ec28eb0a3df9c8edd252f292c7c8e152':
SurfaceFlinger: Add EventControlThread
Jesse Hall [Wed, 16 Oct 2013 00:22:33 +0000 (17:22 -0700)]
resolved conflicts for merge of
e94d204a to master
Change-Id: Idb2030dbb25a2e4b972492587558b25a305e68bd
Jamie Gennis [Tue, 15 Oct 2013 23:17:18 +0000 (16:17 -0700)]
am
0a645cc5: SurfaceFlinger: give SF its own vsync phase
* commit '
0a645cc5a935e67a8d1effc7679a838160b971d8':
SurfaceFlinger: give SF its own vsync phase
Jamie Gennis [Tue, 15 Oct 2013 23:17:18 +0000 (16:17 -0700)]
am
d1700756: SurfaceFlinger: Add EventControlThread
* commit '
d1700756ec9520c3fba22f9a14fd064a6e288810':
SurfaceFlinger: Add EventControlThread
Jesse Hall [Tue, 15 Oct 2013 23:16:47 +0000 (16:16 -0700)]
am
24742375: Merge "Disable hardware vsync when blanking the screen" into klp-dev
* commit '
247423751fd4bfb0b1f87537c985413a28fd04a1':
Disable hardware vsync when blanking the screen
The Android Automerger [Tue, 15 Oct 2013 22:55:41 +0000 (15:55 -0700)]
merge in klp-release history after reset to klp-dev
Jamie Gennis [Tue, 15 Oct 2013 03:52:46 +0000 (20:52 -0700)]
SurfaceFlinger: give SF its own vsync phase
This change allows SurfaceFlinger to run at a different vsync phase offset from
that used by external listeners.
Bug:
11175503
Change-Id: I561c53a5659fa6dc1e3e4ae30340f3c1a6adceb4
Jamie Gennis [Mon, 14 Oct 2013 19:22:52 +0000 (12:22 -0700)]
SurfaceFlinger: Add EventControlThread
This change adds a new thread for calling HWComposer's eventControl
asynchronously. The DispSync-based vsync approach ends up enabling and
disabling HWComposer's vsync callbacks at arbitrary times, and some HWComposer
implementations do not have these calls optimized.
Bug:
11175503
Change-Id: I719be82bd200b391c61d40863b991c7b59acdfd6
Jesse Hall [Tue, 15 Oct 2013 19:53:10 +0000 (19:53 +0000)]
Merge "Disable hardware vsync when blanking the screen" into klp-dev
Aravind Akella [Tue, 15 Oct 2013 17:07:23 +0000 (10:07 -0700)]
am
487c7815: am
641a1868: Merge "SensorService Flush API bug fix." into klp-dev
* commit '
487c7815d7d81570c4f2cf37ceddf10ec84e0c39':
SensorService Flush API bug fix.
Aravind Akella [Tue, 15 Oct 2013 17:05:09 +0000 (10:05 -0700)]
am
641a1868: Merge "SensorService Flush API bug fix." into klp-dev
* commit '
641a18688bc6b208bbeaffa6083d3cf5f6790e4b':
SensorService Flush API bug fix.
Aravind Akella [Tue, 15 Oct 2013 17:01:55 +0000 (17:01 +0000)]
Merge "SensorService Flush API bug fix." into klp-dev
The Android Automerger [Tue, 15 Oct 2013 13:00:54 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
Jesse Hall [Tue, 15 Oct 2013 12:05:36 +0000 (05:05 -0700)]
am
a04fd39c: am
8e26b28b: Filter out vsync events from HWC with duplicate timestamps
* commit '
a04fd39cb88bb6df5f639464f70795f58cd0aefa':
Filter out vsync events from HWC with duplicate timestamps
Jesse Hall [Tue, 15 Oct 2013 03:34:58 +0000 (20:34 -0700)]
am
8e26b28b: Filter out vsync events from HWC with duplicate timestamps
* commit '
8e26b28be62e7c0e093900540db5e5cdcf52a0ff':
Filter out vsync events from HWC with duplicate timestamps
Aravind Akella [Tue, 15 Oct 2013 00:04:42 +0000 (17:04 -0700)]
SensorService Flush API bug fix.
SensorService is dead locking itself when flush is called on older devices which don't support batching. mConnectionLock is acquired twice.
Change-Id: I5c25585bfb2b396df4b05826a9cba1da7997a3ee
Jesse Hall [Mon, 14 Oct 2013 19:56:09 +0000 (12:56 -0700)]
Disable hardware vsync when blanking the screen
Bug:
11220224
Change-Id: I99d0a42e1a6bb0aaf89706f6d100e9ef2a5deaa4
Jesse Hall [Mon, 14 Oct 2013 19:36:45 +0000 (12:36 -0700)]
Filter out vsync events from HWC with duplicate timestamps
Bug:
11220224
Change-Id: I4efe0b66ea8969bf0ec3c4fcb325d354c8a0c315
Aravind Akella [Mon, 14 Oct 2013 17:52:12 +0000 (10:52 -0700)]
am
055558b2: am
2d344979: Merge "Adding PackageManager feature strings for stepcounter and stepdetector." into klp-dev
* commit '
055558b257e893b50a7dff1d60f6ccc970abe46c':
Adding PackageManager feature strings for stepcounter and stepdetector.
Jesse Hall [Mon, 14 Oct 2013 17:51:54 +0000 (10:51 -0700)]
am
44b09f8b: am
44e45cfe: Merge "DispSync: don\'t compensate for wakeup latency" into klp-dev
* commit '
44b09f8b55bef56e06ad584db231916c17e30f5b':
DispSync: don't compensate for wakeup latency
Andy McFadden [Mon, 14 Oct 2013 17:48:32 +0000 (10:48 -0700)]
am
af4ae923: am
6410c8c4: Merge "Use black for blackout layer" into klp-dev
* commit '
af4ae923c3f8a2e40d74eb6291da16b4a6514449':
Use black for blackout layer
The Android Automerger [Mon, 14 Oct 2013 02:20:31 +0000 (19:20 -0700)]
merge in klp-release history after reset to klp-dev
Aravind Akella [Sun, 13 Oct 2013 22:51:59 +0000 (15:51 -0700)]
am
2d344979: Merge "Adding PackageManager feature strings for stepcounter and stepdetector." into klp-dev
* commit '
2d344979eb200b7fb8ba4d811a22c80b1d77b564':
Adding PackageManager feature strings for stepcounter and stepdetector.
Aravind Akella [Sun, 13 Oct 2013 22:47:47 +0000 (22:47 +0000)]
Merge "Adding PackageManager feature strings for stepcounter and stepdetector." into klp-dev
Aravind Akella [Sun, 13 Oct 2013 00:30:40 +0000 (17:30 -0700)]
Adding PackageManager feature strings for stepcounter and stepdetector.
Change-Id: I75ec21900fdc3ea80b61ec12c851a0c5ce9c44e8
Jesse Hall [Sun, 13 Oct 2013 20:18:58 +0000 (13:18 -0700)]
am
44e45cfe: Merge "DispSync: don\'t compensate for wakeup latency" into klp-dev
* commit '
44e45cfeb37a04c206730b12ff001525ebe42a7b':
DispSync: don't compensate for wakeup latency
Jesse Hall [Sun, 13 Oct 2013 20:13:59 +0000 (20:13 +0000)]
Merge "DispSync: don't compensate for wakeup latency" into klp-dev
The Android Automerger [Sun, 13 Oct 2013 13:02:02 +0000 (06:02 -0700)]
merge in klp-release history after reset to klp-dev
Andy McFadden [Fri, 11 Oct 2013 21:47:25 +0000 (14:47 -0700)]
am
6410c8c4: Merge "Use black for blackout layer" into klp-dev
* commit '
6410c8c4097f1a3246aa3d03b3291d47f982bc4b':
Use black for blackout layer
Andy McFadden [Fri, 11 Oct 2013 21:39:49 +0000 (21:39 +0000)]
Merge "Use black for blackout layer" into klp-dev
Aravind Akella [Tue, 8 Oct 2013 21:59:26 +0000 (14:59 -0700)]
Change API from flush(handle) to flush(). Call flush on all active sensors in the given SensorEventConnection.
Change-Id: I4ef2bec80406c517903ab9782dc9eaf3fa8b7f36
Andy McFadden [Fri, 11 Oct 2013 18:16:03 +0000 (11:16 -0700)]
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
Michael Wright [Fri, 11 Oct 2013 01:54:12 +0000 (18:54 -0700)]
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
Dave Burke [Fri, 11 Oct 2013 02:41:28 +0000 (19:41 -0700)]
am
06c964d9: am
9c0dfa09: Merge "Eliminate latency when resampling is disabled" into klp-dev
* commit '
06c964d9b31ac81d3521f97427cdab77ee7d1cff':
Eliminate latency when resampling is disabled
Dave Burke [Fri, 11 Oct 2013 02:39:05 +0000 (19:39 -0700)]
am
9c0dfa09: Merge "Eliminate latency when resampling is disabled" into klp-dev
* commit '
9c0dfa09731a8366a7cdcd7171dde64b73af0d5c':
Eliminate latency when resampling is disabled
Dave Burke [Fri, 11 Oct 2013 02:33:15 +0000 (02:33 +0000)]
Merge "Eliminate latency when resampling is disabled" into klp-dev
Aravind Akella [Fri, 11 Oct 2013 02:26:34 +0000 (19:26 -0700)]
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.
Aravind Akella [Fri, 11 Oct 2013 02:21:05 +0000 (19:21 -0700)]
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.
Aravind Akella [Fri, 11 Oct 2013 02:05:40 +0000 (02:05 +0000)]
Merge "Change API from flush(handle) to flush(). Call flush on all active sensors in the given SensorEventConnection." into klp-dev
Michael Wright [Fri, 11 Oct 2013 01:54:12 +0000 (18:54 -0700)]
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
Jesse Hall [Thu, 10 Oct 2013 23:08:22 +0000 (16:08 -0700)]
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
Jesse Hall [Thu, 10 Oct 2013 23:05:37 +0000 (16:05 -0700)]
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
Jesse Hall [Thu, 10 Oct 2013 22:24:32 +0000 (22:24 +0000)]
Merge "Wake up disp sync thread when setting display period" into klp-dev
Jesse Hall [Thu, 10 Oct 2013 21:48:22 +0000 (14:48 -0700)]
Wake up disp sync thread when setting display period
Bug:
10624956
Change-Id: I272c15f319521bfbd1bb70451366c7dd84d60bf9
Andy McFadden [Wed, 9 Oct 2013 23:38:02 +0000 (16:38 -0700)]
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
Andy McFadden [Thu, 10 Oct 2013 15:38:36 +0000 (08:38 -0700)]
am
c00ab7b5: am
2d8d120d: Fix blank / partial screenshots
* commit '
c00ab7b5aafb7625ad7ebd2af107936df3efc98b':
Fix blank / partial screenshots
Andy McFadden [Thu, 10 Oct 2013 15:23:01 +0000 (08:23 -0700)]
am
2d8d120d: Fix blank / partial screenshots
* commit '
2d8d120dc175c131a75e93fb1de61a9f432ddce9':
Fix blank / partial screenshots
Jamie Gennis [Thu, 10 Oct 2013 00:49:37 +0000 (17:49 -0700)]
DispSync: don't compensate for wakeup latency
This change removes the wakeup latency compensation from the software-generated
vsync events. Choreographer can't handle timestamps in the future, so don't
aim for early wake-ups with the expectation that the actual wake-up will be
late.
Bug:
11153576
Aravind Akella [Tue, 8 Oct 2013 21:59:26 +0000 (14:59 -0700)]
Change API from flush(handle) to flush(). Call flush on all active sensors in the given SensorEventConnection.
Change-Id: I4ef2bec80406c517903ab9782dc9eaf3fa8b7f36
Andy McFadden [Wed, 9 Oct 2013 23:38:02 +0000 (16:38 -0700)]
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
Ed Heyl [Wed, 9 Oct 2013 16:12:50 +0000 (09:12 -0700)]
am
6589a42c: am
98c197d8: merge in KQS81M
* commit '
6589a42c0d7e6062f158b46829c71b092869cc44':
GLConsumer: Add query for current frame number.
Disable GLES 2.x rendering
Initialize mIndent
The Android Automerger [Wed, 9 Oct 2013 13:01:16 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
Jamie Gennis [Wed, 9 Oct 2013 00:50:36 +0000 (17:50 -0700)]
resolved conflicts for merge of
790b6d09 to master
Ed Heyl [Tue, 8 Oct 2013 22:57:56 +0000 (15:57 -0700)]
am
98c197d8: merge in KQS81M
* commit '
98c197d826f95a82de41e16350f58a70a7ad23c6':
GLConsumer: Add query for current frame number.
Disable GLES 2.x rendering
Initialize mIndent
Ed Heyl [Tue, 8 Oct 2013 22:40:38 +0000 (15:40 -0700)]
merge in KQS81M
Jamie Gennis [Tue, 8 Oct 2013 22:17:12 +0000 (15:17 -0700)]
am
faf77cce: SurfaceFlinger: SW-based vsync events
* commit '
faf77cce9d9ec0238d6999b3bd0d40c71ff403c5':
SurfaceFlinger: SW-based vsync events
Jamie Gennis [Tue, 30 Jul 2013 22:10:32 +0000 (15:10 -0700)]
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
The Android Automerger [Sun, 6 Oct 2013 13:01:27 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
Alex Ray [Fri, 4 Oct 2013 21:21:17 +0000 (14:21 -0700)]
am
859d1e49: am
d457ec52: Add feature android.hardware.consumerir xml file
* commit '
859d1e490bcf07be9353a0e6c26264ef38fe0610':
Add feature android.hardware.consumerir xml file
Alex Ray [Fri, 4 Oct 2013 21:18:35 +0000 (14:18 -0700)]
am
d457ec52: Add feature android.hardware.consumerir xml file
* commit '
d457ec52d7023e9a6112f313cd2bf94293162214':
Add feature android.hardware.consumerir xml file
Marco Nelissen [Fri, 4 Oct 2013 18:09:01 +0000 (11:09 -0700)]
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
Lajos Molnar [Fri, 4 Oct 2013 18:09:01 +0000 (11:09 -0700)]
am
04e6ab6e: am
b1f94ef3: Merge "media/hardware/HardwareAPI.h: Added PrepareForAdaptivePlaybackParams" into klp-dev
* commit '
04e6ab6e27c39604a7029467161a90af78ecdf07':
media/hardware/HardwareAPI.h: Added PrepareForAdaptivePlaybackParams
Alan Viverette [Thu, 3 Oct 2013 23:40:52 +0000 (16:40 -0700)]
Simplify color adjustment using homogeneous coordinates
Change-Id: Ie31abacb134c29d82a6041fa7d521f68a1a273af
Marco Nelissen [Thu, 3 Oct 2013 22:40:30 +0000 (15:40 -0700)]
am
48d3741b: Merge "Allow blaming a single uid for work done" into klp-dev
* commit '
48d3741ba5f4b3bb411ee5c083a11f4f52f9e907':
Allow blaming a single uid for work done
Lajos Molnar [Thu, 3 Oct 2013 22:40:30 +0000 (15:40 -0700)]
am
b1f94ef3: Merge "media/hardware/HardwareAPI.h: Added PrepareForAdaptivePlaybackParams" into klp-dev
* commit '
b1f94ef3f97bd20b928cf980791526861650eab9':
media/hardware/HardwareAPI.h: Added PrepareForAdaptivePlaybackParams
Alex Ray [Thu, 3 Oct 2013 20:09:37 +0000 (13:09 -0700)]
Add feature android.hardware.consumerir xml file
Bug:
10676690
Change-Id: I2cc62b9c97a71588c43ff96ca38d470976bde9b0
Mike Lockwood [Thu, 3 Oct 2013 18:14:09 +0000 (11:14 -0700)]
Fix the build
Change-Id: I73f1c2e9e2e565602aa78b51a2cea2d619d7b0e9
Mike Lockwood [Thu, 3 Oct 2013 17:29:39 +0000 (10:29 -0700)]
Move libandroidfw from frameworks/base
Change-Id: I8228c9a796e68e920c6a7dfc154c4b70ba66b082
Marco Nelissen [Thu, 3 Oct 2013 16:34:51 +0000 (16:34 +0000)]
Merge "Allow blaming a single uid for work done" into klp-dev
Lajos Molnar [Thu, 3 Oct 2013 16:10:25 +0000 (16:10 +0000)]
Merge "media/hardware/HardwareAPI.h: Added PrepareForAdaptivePlaybackParams" into klp-dev
Marco Nelissen [Wed, 2 Oct 2013 19:42:20 +0000 (12:42 -0700)]
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
The Android Automerger [Thu, 3 Oct 2013 13:02:17 +0000 (06:02 -0700)]
merge in klp-release history after reset to klp-dev
Jesse Hall [Wed, 2 Oct 2013 00:25:20 +0000 (17:25 -0700)]
Set the outbuf acquire fence after we actually have it.
In GLES-only mode, we don't have the outbuf acquire fence until after
GLES composition is done for the frame. We were setting the fence in
HWC's state immediately after dequeueing the buffer from the consumer,
before GLES had started. This fence got passed through HWC and on to
the consumer, so the consumer was reading the buffer before GLES was
done writing to it.
Now we update HWC's state just before set(), when we know we have the
right fence.
Bug:
11000763
Change-Id: Iea9db4c69634c352dc2d600f0bdb6bef2a432636
Mathias Agopian [Tue, 1 Oct 2013 22:36:52 +0000 (15:36 -0700)]
only clear FB when asked for the opaque layer
a layer need to be considered NOT opaque if it has a
plane-alpha.
Bug:
10846930
Change-Id: Ibd8981b63ede4560c7096bacc4cff46a7eb2a8bb
Jesse Hall [Mon, 30 Sep 2013 23:49:30 +0000 (16:49 -0700)]
Treat composition frames with no layers as using GLES composition
When there are no window layers for a display, SurfaceFlinger clears
the undefined region using GLES. Some of the places that check for
GLES composition weren't considering this special case, in particular:
- We were skipping the eglSwapBuffers() on these frames.
- We were putting VirtualDisplaySurface in HWC-only composition mode.
This change centralizes the logic for this special case.
Bug:
10957068
Change-Id: I2deaf2ed101e8ea76708862a6bb67751b6078794
Jamie Gennis [Wed, 2 Oct 2013 18:19:52 +0000 (11:19 -0700)]
am
6be1d210: am
f0cf5f10: BufferQueue: fix a test crash
* commit '
6be1d210eef392f5745d58a0033572b1af4b2f2a':
BufferQueue: fix a test crash
Jamie Gennis [Wed, 2 Oct 2013 18:16:59 +0000 (11:16 -0700)]
am
f0cf5f10: BufferQueue: fix a test crash
* commit '
f0cf5f103cf9c54d59de4ed6f1d8ddd2302dec1b':
BufferQueue: fix a test crash
Jamie Gennis [Thu, 26 Sep 2013 00:21:56 +0000 (17:21 -0700)]
BufferQueue: fix a test crash
Bug:
10935880
Change-Id: If76e9fb055103bad0db7e6c16487532671573149
Jamie Gennis [Wed, 2 Oct 2013 17:44:44 +0000 (10:44 -0700)]
am
886b1521: am
a9c47f32: Merge "GLConsumer: start using EGL_ANDROID_image_crop" into klp-dev
* commit '
886b152111cc13dcfe1b47724f5e496f12ccc420':
GLConsumer: start using EGL_ANDROID_image_crop
Dave Burke [Wed, 2 Oct 2013 17:44:44 +0000 (10:44 -0700)]
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
Jamie Gennis [Wed, 2 Oct 2013 17:41:58 +0000 (10:41 -0700)]
am
a9c47f32: Merge "GLConsumer: start using EGL_ANDROID_image_crop" into klp-dev
* commit '
a9c47f327373cbe48e187442c7f9554d24a75c08':
GLConsumer: start using EGL_ANDROID_image_crop
Dave Burke [Wed, 2 Oct 2013 17:41:57 +0000 (10:41 -0700)]
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
Jamie Gennis [Wed, 2 Oct 2013 17:36:48 +0000 (17:36 +0000)]
Merge "GLConsumer: start using EGL_ANDROID_image_crop" into klp-dev