Mathias Agopian
81cd5d3b94
make sure we don't call into the HWC HAL when not needed
...
when enabling/disabling vsync we now make sure to
not call into the HAL if the state wouldn't change.
Bug: 7274951
Change-Id: Ie24a6d68888a51b577acf9c2a973d85437cbacaf
2012-10-04 15:25:32 -07:00
Andy McFadden
eb1caaea69
Fix crashes after HDMI disconnect
...
The display was being removed from SurfaceFlinger's list before we
had a chance to reset HWComposer's layer list, so we were passing
stale data into the hardware composer (which has its own per-display
data). This resulted in "invalid gralloc handle" complaints.
We now clear the layer list immediately after removing the display.
The display was being removed while its EGLSurface was still
"current", resulting in "cancelBuffer: BufferQueue has been
abandoned" complaints. We now call makeCurrent on the primary
display before removing the external display.
Bug 7274254
Change-Id: Ia59e3a61d7ec46488b96bf93ec5e4ed3488b70e4
2012-10-04 14:42:03 -07:00
Andy McFadden
42d7dfccee
am 61f142a2
: am 27ec5739
: Fix crashes after HDMI disconnect
...
* commit '61f142a25c14c8e24f8040098b4c223f0d725cb2':
Fix crashes after HDMI disconnect
2012-10-04 12:29:00 -07:00
Andy McFadden
61f142a25c
am 27ec5739
: Fix crashes after HDMI disconnect
...
* commit '27ec5739bc05330e08b02f25b62a8f597bad897a':
Fix crashes after HDMI disconnect
2012-10-04 12:11:11 -07:00
The Android Open Source Project
07f86ae970
am af4324cc
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'af4324cc0ad6fb4d4a7716ebff2421424c4a2292':
Fix issue #7271589 : Cannot set Ocean HD live wallpaper
2012-10-04 07:52:23 -07:00
The Android Open Source Project
af4324cc0a
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I4e8f1a58de984fa0945b9df9e8bc230c11e7fc58
2012-10-04 07:48:28 -07:00
The Android Automerger
5031729a37
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-04 06:59:43 -07:00
Andy McFadden
27ec5739bc
Fix crashes after HDMI disconnect
...
The display was being removed from SurfaceFlinger's list before we
had a chance to reset HWComposer's layer list, so we were passing
stale data into the hardware composer (which has its own per-display
data). This resulted in "invalid gralloc handle" complaints.
We now clear the layer list immediately after removing the display.
The display was being removed while its EGLSurface was still
"current", resulting in "cancelBuffer: BufferQueue has been
abandoned" complaints. We now call makeCurrent on the primary
display before removing the external display.
Bug 7274254
Change-Id: Ia59e3a61d7ec46488b96bf93ec5e4ed3488b70e4
2012-10-04 02:02:23 -07:00
Jamie Gennis
f05130f1cb
am 2526675e
: am a573945d
: libgui: enable fence support for exynos5
...
* commit '2526675e907dd9b3d224760a87185c017f66a796':
libgui: enable fence support for exynos5
2012-10-03 17:15:22 -07:00
Jamie Gennis
2526675e90
am a573945d
: libgui: enable fence support for exynos5
...
* commit 'a573945df7d21cfb73aa9cdba41561105e2ffb01':
libgui: enable fence support for exynos5
2012-10-03 17:12:57 -07:00
Dianne Hackborn
078da147f4
Fix issue #7271589 : Cannot set Ocean HD live wallpaper
...
Change-Id: Id7662c503815293040c240232a6622bd6f6eab37
2012-10-03 16:17:30 -07:00
Jamie Gennis
a573945df7
libgui: enable fence support for exynos5
...
Change-Id: Iffc48412b8c951116a956a3ac7dab8d75eed13da
Bug: 7238122
2012-10-03 15:55:14 -07:00
Jamie Gennis
e3e9921c86
am 596f5efd
: am 3fd12e41
: libgui: fix up compile options
...
* commit '596f5efd4e0f151f7a33fbe3569551d0c6266728':
libgui: fix up compile options
2012-10-03 15:41:46 -07:00
Jamie Gennis
596f5efd4e
am 3fd12e41
: libgui: fix up compile options
...
* commit '3fd12e41afcf323fdb99a4cf6bef0f904d72cc8b':
libgui: fix up compile options
2012-10-03 15:39:29 -07:00
Jamie Gennis
3fd12e41af
libgui: fix up compile options
...
This change adds debug info to SurfaceFlinger's dumpsys to indicate that the
USE_WAIT_SYNC compile option was enabled, and it removes the
ALLOW_DEQUEUE_CURRENT_BUFFER option.
Bug: 7238122
Change-Id: I70e08e34c2ef58aa6d2f88229e781a119f84b5a9
2012-10-03 15:05:58 -07:00
Dianne Hackborn
a3e8adbb19
am ec5f313a
: am 35387922
: Merge "Fix issue #7271589 : Cannot set Ocean HD live wallpaper" into jb-mr1-dev
...
* commit 'ec5f313aa8dda899866fe8ab4dcfd47acd54c014':
Fix issue #7271589 : Cannot set Ocean HD live wallpaper
2012-10-03 14:04:43 -07:00
Dianne Hackborn
ec5f313aa8
am 35387922
: Merge "Fix issue #7271589 : Cannot set Ocean HD live wallpaper" into jb-mr1-dev
...
* commit '35387922bd3213ea4c376c7dcfb109da67a6a33e':
Fix issue #7271589 : Cannot set Ocean HD live wallpaper
2012-10-03 13:53:43 -07:00
Dianne Hackborn
35387922bd
Merge "Fix issue #7271589 : Cannot set Ocean HD live wallpaper" into jb-mr1-dev
2012-10-03 12:09:13 -07:00
Dianne Hackborn
7f3096ca88
Fix issue #7271589 : Cannot set Ocean HD live wallpaper
...
Change-Id: Id7662c503815293040c240232a6622bd6f6eab37
2012-10-03 11:27:19 -07:00
The Android Open Source Project
963484eeea
am 67091644
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '670916447290d619e4b689d3643f629f058fc244':
2012-10-03 07:36:31 -07:00
The Android Open Source Project
6709164472
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I0c361b5f1fde8ab48360efa3a06ab7d2ccb88370
2012-10-03 07:34:04 -07:00
The Android Automerger
5ff5d16d32
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-03 06:59:44 -07:00
Jesse Hall
c2e3e07549
am ee5fb929
: am ba607d53
: Add Fence::waitForever which logs a warning timeout, and use it
...
* commit 'ee5fb9299b6a7d81af6c2c1e598c4e9fd71a8ba9':
Add Fence::waitForever which logs a warning timeout, and use it
2012-10-02 16:36:16 -07:00
Jesse Hall
ee5fb9299b
am ba607d53
: Add Fence::waitForever which logs a warning timeout, and use it
...
* commit 'ba607d53c6a94ea8c4c12571980c4ad159af308b':
Add Fence::waitForever which logs a warning timeout, and use it
2012-10-02 16:35:17 -07:00
Jesse Hall
ba607d53c6
Add Fence::waitForever which logs a warning timeout, and use it
...
Bug: 7217641
Change-Id: If0c1a613ead307c4045a47824174bf40c72bc7d7
2012-10-02 16:29:46 -07:00
Kenny Root
56dd06c684
am 7011d5a4
: am ee42072b
: am 52f1edb3
: Merge "Update tests for new build target"
...
* commit '7011d5a46b0b6e5a3cf31949036084c312343b3c':
Update tests for new build target
2012-10-02 09:57:54 -07:00
Kenny Root
7011d5a46b
am ee42072b
: am 52f1edb3
: Merge "Update tests for new build target"
...
* commit 'ee42072bcccab880dd685736a32a56ac62ffc331':
Update tests for new build target
2012-10-02 09:55:49 -07:00
Kenny Root
ee42072bcc
am 52f1edb3
: Merge "Update tests for new build target"
...
* commit '52f1edb3f11aae1af74a1bfc6f18f81b4d761358':
Update tests for new build target
2012-10-02 09:54:22 -07:00
Kenny Root
52f1edb3f1
Merge "Update tests for new build target"
2012-10-02 09:46:29 -07:00
Kenny Root
ed22c1cfe5
Update tests for new build target
...
Change-Id: Ia1740d1b2c0b611c4559c5c846b12fb5c3e81b07
2012-10-02 09:42:49 -07:00
The Android Open Source Project
62e6741f15
am 64a48d28
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '64a48d284c846250e541f350698c10aa1f9c5a50':
Revert "Compatibility work around for bad graphics driver dependency."
2012-10-02 09:21:15 -07:00
The Android Open Source Project
64a48d284c
Reconcile with jb-mr1-release - do not merge
...
Change-Id: If7c87d1cb0dc5bb52bb5a6e4b7fa8563c8e30694
2012-10-02 09:18:33 -07:00
The Android Automerger
0b08131b60
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-02 06:59:40 -07:00
Mathias Agopian
b5cca09bf8
am 8345fb00
: (-s ours) am 2ae7bec7
: Revert "improve sensor fusion" -- DO NOT MERGE
...
* commit '8345fb00edbf71f0e291ff5c1540574f3eb54ecb':
Revert "improve sensor fusion" -- DO NOT MERGE
2012-10-01 23:39:30 -07:00
Mathias Agopian
8345fb00ed
am 2ae7bec7
: Revert "improve sensor fusion" -- DO NOT MERGE
...
* commit '2ae7bec77093744206080dbae020edfa3bfac2e1':
Revert "improve sensor fusion" -- DO NOT MERGE
2012-10-01 23:35:57 -07:00
Mathias Agopian
2ae7bec770
Revert "improve sensor fusion" -- DO NOT MERGE
...
This reverts commit bdf277355d
.
This reverts commit dc5b63e40e
.
it might be responsible for a regression that makes the
rotation vector spin.
Bug: 7267330
Change-Id: Ifb10e933537e70c1d85a7ba73a7e3ae59002fe62
2012-10-01 20:31:05 -07:00
Siva Velusamy
090503a01c
gltrace: Fix NPE
...
Change-Id: Id7af9cd388f3508201f96a0624966c2ce01b4da5
2012-10-01 14:30:48 -07:00
Jeff Sharkey
302a733a8b
am 7006cdfc
: am 0c2a25c1
: Merge "Include Global table in bugreports." into jb-mr1-dev
...
* commit '7006cdfc72bbb58d9460189a691b6b0fe615524b':
Include Global table in bugreports.
2012-10-01 13:48:42 -07:00
Jamie Gennis
93b6c79501
am a6f895ee
: am d30b36d1
: SurfaceFlinger: reset the FB_TGT acquire fence
...
* commit 'a6f895ee344a350dad60e74b78539a4d5ba41e52':
SurfaceFlinger: reset the FB_TGT acquire fence
2012-10-01 13:48:09 -07:00
Dianne Hackborn
290f3f3130
am 9c63cdd6
: am ec0f5e5f
: Merge "Fix issue #7257947 : Need to fix heap limits on Mako" into jb-mr1-dev
...
* commit '9c63cdd6b0ff28d3a371aa8c6121411fbf7f0a76':
Fix issue #7257947 : Need to fix heap limits on Mako
2012-10-01 13:47:56 -07:00
Mathias Agopian
4c5158639b
am f8e5c37b
: am 135e5899
: save/restore viewport properly when taking screenshot
...
* commit 'f8e5c37bc59c70b0a0388f8a690d0d4bead9cc6f':
save/restore viewport properly when taking screenshot
2012-10-01 13:46:10 -07:00
Jeff Sharkey
7006cdfc72
am 0c2a25c1
: Merge "Include Global table in bugreports." into jb-mr1-dev
...
* commit '0c2a25c11c6688dbc682eabecbdfbc1587ada684':
Include Global table in bugreports.
2012-10-01 13:11:47 -07:00
Jeff Sharkey
0c2a25c11c
Merge "Include Global table in bugreports." into jb-mr1-dev
2012-10-01 13:08:22 -07:00
Jeff Sharkey
719b8aa1c5
Include Global table in bugreports.
...
Bug: 7257648
Change-Id: I84c7230fd115cf9d7269bc5367026b52cbcc86ac
2012-10-01 12:52:42 -07:00
Jamie Gennis
a6f895ee34
am d30b36d1
: SurfaceFlinger: reset the FB_TGT acquire fence
...
* commit 'd30b36d1fd0c7ab80553e784a155266be9703e47':
SurfaceFlinger: reset the FB_TGT acquire fence
2012-10-01 12:29:34 -07:00
Jamie Gennis
d30b36d1fd
SurfaceFlinger: reset the FB_TGT acquire fence
...
This change makes SurfaceFlinger reset the acquire fence fd to -1 after each
call to HWComposer::commit. The HWComposer implementation is resonsible for
closing the fd, so SurfaceFlinger should make sure not to pass it to HWC
multiple times.
Change-Id: I79554d9f6d6ef2b77d632d40251516c1f5b16ddb
Bug: 7258954
2012-10-01 12:24:59 -07:00
Dianne Hackborn
9c63cdd6b0
am ec0f5e5f
: Merge "Fix issue #7257947 : Need to fix heap limits on Mako" into jb-mr1-dev
...
* commit 'ec0f5e5f0c433666698fa55c2e38ccdc9cf0df44':
Fix issue #7257947 : Need to fix heap limits on Mako
2012-10-01 11:42:49 -07:00
Dianne Hackborn
ec0f5e5f0c
Merge "Fix issue #7257947 : Need to fix heap limits on Mako" into jb-mr1-dev
2012-10-01 11:38:19 -07:00
Mathias Agopian
f8e5c37bc5
am 135e5899
: save/restore viewport properly when taking screenshot
...
* commit '135e5899f70a67e62baaf6dbec7ba2ce611ca16a':
save/restore viewport properly when taking screenshot
2012-10-01 10:16:47 -07:00
The Android Automerger
988ae777fa
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-01 06:59:20 -07:00