OSDN Git Service
Mathias Agopian [Wed, 28 Nov 2012 00:07:04 +0000 (16:07 -0800)]
Merge "make transform hint multi-display aware" into jb-mr1.1-dev
Andy McFadden [Tue, 27 Nov 2012 15:36:50 +0000 (07:36 -0800)]
Merge "DO NOT MERGE - native_fence_sync: fix an enum name" into jb-mr1.1-dev
Jamie Gennis [Mon, 26 Nov 2012 21:54:56 +0000 (13:54 -0800)]
DO NOT MERGE - native_fence_sync: fix an enum name
This change replaces all references to the "EGL_NO_NATIVE_FENCE_ANDROID" enum
with "EGL_NO_NATIVE_FENCE_FD_ANDROID".
Bug: http://code.google.com/p/android/issues/detail?id=40295
(cherry-pick from master)
Change-Id: Ie25d4ab9721d8b69b8d4afcf18e902ef8e3ad911
Mathias Agopian [Thu, 22 Nov 2012 00:02:13 +0000 (16:02 -0800)]
make transform hint multi-display aware
if a layer is not mirrored, we now use its display
as the source for the transfrom hint calculation
instead of always using the default (main) display.
this change does two thing:
1) we make updateTransformHint take a DisplayDevice
as a parameter instead of hard-coding the
main display.
2) each time we do a transaction that could change
the hint, we go through all layers and
figure out which display should be used for their
transform hint.
Bug:
7599344
Change-Id: I9b04a95e6c372dd770bacf81d8ef6f8e31b87b83
Siva Velusamy [Tue, 20 Nov 2012 21:39:57 +0000 (13:39 -0800)]
gltrace: Make sure device is debuggable.
(cherry picked from commit
6482fa4db0a7ac99cd3503d6bf170f80b26fb695)
Change-Id: I205aabcab1932025c12e7ba3d1b3cf94684f6758
Mathias Agopian [Tue, 20 Nov 2012 00:50:24 +0000 (16:50 -0800)]
fix typo that broke all the builds
Bug:
7584338
Change-Id: Ieb8c27a544ac583af9aa1e0376e33a673d2d9673
Mathias Agopian [Mon, 19 Nov 2012 23:07:33 +0000 (15:07 -0800)]
workaround: don't reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE]
This workaround a HWC HAL issue in Nexus 7, which causes videos and live
wallpapers to animate slowly.
Bug:
7563862
Change-Id: I16ad85317e3e7f47f005e7397357c14186b0a13d
Mathias Agopian [Fri, 16 Nov 2012 01:19:48 +0000 (17:19 -0800)]
fix an out-of-bounds memory access
in this particular case, this OOB is always harmless
(and that's why it didn't get fixed from MR1), however,
it interfers with valgrind debugging.
Change-Id: Ic977e03287e59c4b124a89146c9023bd0cb540a8
Mathias Agopian [Wed, 14 Nov 2012 22:41:42 +0000 (14:41 -0800)]
Reset compositionType to HWC_FRAMEBUFFER before calling prepare()
Honor the documentation. this broke in JB-MR1.
Change-Id: I841a93b409fc940374bc748c4e143d82a192669c
Andy McFadden [Mon, 29 Oct 2012 23:49:44 +0000 (16:49 -0700)]
Reduce emulator logspam
The emulator doesn't support systrace, but we should point that out
at most once per process.
Bug
7436352
Change-Id: I06b2c1ea0df6c02c11cd2496423c337f8d7c62a1
Dmitry Shmidt [Wed, 7 Nov 2012 19:09:46 +0000 (11:09 -0800)]
bugreport: Add /proc/interrupts dump
Bug:
7301178
Change-Id: Ifad3b981ac904d4637d69dfc223d5bb2c9d80bda
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Dmitry Shmidt [Wed, 7 Nov 2012 18:42:05 +0000 (10:42 -0800)]
bugreport: Add wlan FW counters dump for bcmdhd
Bug:
7494877
Change-Id: I4d24dbcf7596777ec02ab1312c2ab996ba7688f1
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
The Android Open Source Project [Tue, 6 Nov 2012 20:17:20 +0000 (12:17 -0800)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I219247f1b0f5d87b4144dc1535039e93fc636a94
The Android Automerger [Tue, 6 Nov 2012 02:38:55 +0000 (18:38 -0800)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Mathias Agopian [Tue, 6 Nov 2012 01:50:57 +0000 (17:50 -0800)]
fix transitions from hwc to GLES composition
If we switched from HWC to GLES but the dirty region was empty
(could happen if the dirty region is outside of the screen for instance), we
need to force a full screen composition.
In this change we ignore the dirty region for the purpose of
rejecting the whole update and we rely on the fact that it will later
be expanded to the whole screen. This was the least risky fix.
Bug:
7467760,
7452931
Change-Id: I2132f2f963b00a3ce7150adadb107b0367b3862e
The Android Automerger [Tue, 30 Oct 2012 15:52:44 +0000 (08:52 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Colin Cross [Mon, 29 Oct 2012 05:41:06 +0000 (22:41 -0700)]
dumpstate: add kernel memory fragmentation unusable index
Dump /d/extfrag/unusable_index in bugreports. It shows the
percentage of memory in each zone that is not available for
allocations for each order.
Change-Id: I2af6680cb609887ea7b3d6107d1aa88bd0206b52
Mathias Agopian [Wed, 24 Oct 2012 23:29:17 +0000 (16:29 -0700)]
partially implement external display clipping
we perform external display clipping only on the GL
side (ie: not done on the h/w composer side, which is
harder and would be too risky). in practice this means
that WFD will be clipped properly, while HDMI *may* or
may not depending on how hwc is used.
Bug:
7149437
Change-Id: I92d4d04220db72b6ffb134c7fa7a93af569723a5
The Android Automerger [Thu, 25 Oct 2012 20:42:23 +0000 (13:42 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Mathias Agopian [Wed, 24 Oct 2012 23:29:17 +0000 (16:29 -0700)]
partially implement external display clipping
we perform external display clipping only on the GL
side (ie: not done on the h/w composer side, which is
harder and would be too risky). in practice this means
that WFD will be clipped properly, while HDMI *may* or
may not depending on how hwc is used.
Bug:
7149437
Change-Id: I92d4d04220db72b6ffb134c7fa7a93af569723a5
Dave Burke [Thu, 25 Oct 2012 00:30:31 +0000 (17:30 -0700)]
Revert "Revert "put back the unused virtuals in Vector<>""
This reverts commit
225c66a48cdc3acef21ee380dc134449749d3cb3
Change-Id: If31a04b81052cbc7dd7bf237c07107c33066d03d
The Android Automerger [Mon, 22 Oct 2012 23:42:08 +0000 (16:42 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Mathias Agopian [Mon, 22 Oct 2012 21:27:45 +0000 (14:27 -0700)]
prevent a client from crashing surfaceflinger
a misbehaving or malicious client could cause SF to crash
by providing a "fake" IInterface. we now check the
IInterface we get is our own and local.
Bug:
7278879
Change-Id: Ia19d05902d4b2385c5a16416148378d4998833fd
Jamie Gennis [Mon, 22 Oct 2012 20:50:18 +0000 (13:50 -0700)]
Merge "SurfaceFlinger: add support for secure displays" into jb-mr1-dev
Jamie Gennis [Sat, 20 Oct 2012 01:19:11 +0000 (18:19 -0700)]
SurfaceFlinger: add support for secure displays
This change adds support for displays that are not allowed to display surfaces
with the eSecure flag set. All non-virtual displays are considered secure,
while virtual displays have their secure-ness specified at creation time.
Bug:
7368436
Change-Id: I81ad535d2d1e5a7ff78269017e85b111f0098500
Jesse Hall [Mon, 15 Oct 2012 19:38:33 +0000 (12:38 -0700)]
Always set vertex alpha when drawing screenshot layers
The screenshot is a GL_RGB texture, and the GL_REPLACE texture env
mode uses vertex alpha for GL_RGB textures instead of alpha=1.0.
Bug:
7340077
Change-Id: I6fbb907023e48f9c422b15a33da79757d6726840
The Android Automerger [Sun, 21 Oct 2012 06:14:12 +0000 (23:14 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Andy McFadden [Fri, 19 Oct 2012 19:53:46 +0000 (12:53 -0700)]
Fix emulator vsync
The code that reserves display IDs was only run when a hardware
composer was present. The eventControl() function, which handles
enabling of vsync, was ignoring the request because the primary
display didn't appear in its set of allocated IDs. This moves
reservation of IDs for built-in displays outside the HWC-only block.
Also, added a couple of warnings in eventControl().
Bug
7376568
Change-Id: I185ccdf817a25499b5c2668f8f6d594afb8c1568
The Android Automerger [Fri, 19 Oct 2012 13:59:39 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Romain Guy [Fri, 19 Oct 2012 00:33:36 +0000 (17:33 -0700)]
Merge "Add runtime debugging capabilities to OpenGL" into jb-mr1-dev
Romain Guy [Thu, 18 Oct 2012 23:16:10 +0000 (16:16 -0700)]
Add runtime debugging capabilities to OpenGL
The shell property debug.egl.trace can now be set to:
0
disables tracing
1
logs all GL calls
error
checks glGetError after every GL call, logs a stack trace on error
systrace
logs each GL call to systrace
Change-Id: I34a2a2d4e19c373fd9eaa1b0cd93e67c87378996
The Android Automerger [Thu, 18 Oct 2012 13:59:41 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 17 Oct 2012 23:07:12 +0000 (16:07 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jamie Gennis [Wed, 17 Oct 2012 16:29:47 +0000 (09:29 -0700)]
SurfaceFlinger: change the animation timeout
This change changes the animation transaction timeout from 500us to 5s.
Bug:
7362633
Change-Id: I9bed8e74f726dae2daa398afc29babcea00d5b04
Jamie Gennis [Wed, 17 Oct 2012 16:32:42 +0000 (09:32 -0700)]
Merge "BufferQueue: alloc without holding the lock" into jb-mr1-dev
The Android Automerger [Wed, 17 Oct 2012 00:30:45 +0000 (17:30 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jamie Gennis [Tue, 16 Oct 2012 01:24:43 +0000 (18:24 -0700)]
SurfaceFlinger: add animation transactions
This change adds a transaction flag for WindowManager to indicate that a
transaction is being used to animate windows around the screen. SurfaceFlinger
will not allow more than one of these transactions to be outstanding at a time
to prevent the animation "frames" from being dropped.
Bug:
7353840
Change-Id: I6488a6e0e1ed13d27356d2203c9dc766dc6b1759
Romain Guy [Tue, 16 Oct 2012 16:45:01 +0000 (09:45 -0700)]
Merge "Update comments to reflect what the code actually does" into jb-mr1-dev
The Android Automerger [Tue, 16 Oct 2012 13:59:29 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Mathias Agopian [Mon, 15 Oct 2012 23:51:41 +0000 (16:51 -0700)]
fix a corruption in blank/unblank
we were holding a reference (ie: pointer) to a sp<DisplayDevice>
while processing the message. Meanwhile the object itself could
go away and we would end up accessing a dead object.
the root cause of the problem is that we are accessing mDisplays[]
in a few places outside of the main thread.
Bug:
7352770
Change-Id: I89e35dd85fb30e9a6383eca9a0bbc7028363876c
Jamie Gennis [Tue, 16 Oct 2012 02:36:11 +0000 (19:36 -0700)]
Merge "SurfaceFlinger: add animation transactions" into jb-mr1-dev
Romain Guy [Tue, 16 Oct 2012 02:25:18 +0000 (19:25 -0700)]
Update comments to reflect what the code actually does
Change-Id: I2613aa32c29eddc52a00090656c1bd11f9f5732b
Jamie Gennis [Tue, 16 Oct 2012 01:24:43 +0000 (18:24 -0700)]
SurfaceFlinger: add animation transactions
This change adds a transaction flag for WindowManager to indicate that a
transaction is being used to animate windows around the screen. SurfaceFlinger
will not allow more than one of these transactions to be outstanding at a time
to prevent the animation "frames" from being dropped.
Bug:
7353840
Change-Id: I6488a6e0e1ed13d27356d2203c9dc766dc6b1759
Romain Guy [Tue, 16 Oct 2012 01:43:19 +0000 (18:43 -0700)]
Merge "Add new debug option to force 4x MSAA in OpenGL ES 2.0 apps" into jb-mr1-dev
Romain Guy [Tue, 16 Oct 2012 01:13:05 +0000 (18:13 -0700)]
Add new debug option to force 4x MSAA in OpenGL ES 2.0 apps
Change-Id: I53ac91a9ce07b5dd5f2ee0e3cc5b65b6402f9229
Jesse Hall [Mon, 15 Oct 2012 19:38:33 +0000 (12:38 -0700)]
Always set vertex alpha when drawing screenshot layers
The screenshot is a GL_RGB texture, and the GL_REPLACE texture env
mode uses vertex alpha for GL_RGB textures instead of alpha=1.0.
Bug:
7340077
Change-Id: I6fbb907023e48f9c422b15a33da79757d6726840
The Android Automerger [Mon, 15 Oct 2012 19:30:57 +0000 (12:30 -0700)]
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
The Android Automerger [Sat, 13 Oct 2012 10:50:10 +0000 (03:50 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Kenny Root [Sat, 13 Oct 2012 06:39:47 +0000 (23:39 -0700)]
Merge "Add TEMP_FAILURE_RETRY around open and write calls" into jb-mr1-dev
The Android Automerger [Fri, 12 Oct 2012 23:34:34 +0000 (16:34 -0700)]
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
The Android Automerger [Fri, 12 Oct 2012 23:32:47 +0000 (16:32 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jamie Gennis [Fri, 12 Oct 2012 21:33:51 +0000 (14:33 -0700)]
Merge "SurfaceFlinger: make the num FBs a board config" into jb-mr1-dev
Jamie Gennis [Fri, 12 Oct 2012 21:18:10 +0000 (14:18 -0700)]
SurfaceFlinger: make the num FBs a board config
Bug:
7283132
Change-Id: I38116f39fc18212f2daab94bbfc3daaf89439fc4
Kenny Root [Fri, 12 Oct 2012 06:42:05 +0000 (23:42 -0700)]
Add TEMP_FAILURE_RETRY around open and write calls
Bug:
7330849
Change-Id: I9aef3c3d3a248c3eea7ca060124ad6decaa6b4da
The Android Automerger [Fri, 12 Oct 2012 17:26:47 +0000 (10:26 -0700)]
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
Jamie Gennis [Fri, 5 Oct 2012 01:34:01 +0000 (18:34 -0700)]
BufferQueue: alloc without holding the lock
This change makes BufferQueue::dequeueBuffer release its mutex before
allocating new buffers. This should alleviate lock contention in
SurfaceFlinger where SF's main thread can get blocked waiting for an allocation
operation to complete.
Bug:
7335075
Change-Id: I1b000539cc616a695afab2e9c68507db69e57b13
The Android Automerger [Thu, 11 Oct 2012 23:26:37 +0000 (16:26 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Thu, 11 Oct 2012 15:19:15 +0000 (08:19 -0700)]
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
The Android Automerger [Thu, 11 Oct 2012 14:03:50 +0000 (07:03 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jesse Hall [Thu, 11 Oct 2012 04:37:22 +0000 (21:37 -0700)]
Assume LayerScreenshot has pre-multiplied alpha
Bug:
7300129
Change-Id: Ie9114adc4b5c9a8cc3c65bfe6d9478b2cba4e0d8
Andy McFadden [Thu, 11 Oct 2012 02:34:11 +0000 (19:34 -0700)]
Merge "Fix HDMI unblank behavior" into jb-mr1-dev
Andy McFadden [Thu, 11 Oct 2012 01:17:51 +0000 (18:17 -0700)]
Fix HDMI unblank behavior
Two issues:
(1) We were announcing the hotplug event before we were ready to
handle blank/unblank events, so we were losing the initial unblank
that power manager sends us when HDMI is first plugged in. This
left the display blank until you toggled the device power off/on.
(2) We were retaining fbTargetHandle for HDMI after the display was
disconnected. The value didn't get updated when HDMI was reconnected
because the display was blank, so we didn't go through that code
path. So, when HDMI was re-connected, we passed stale data into
the HWC.
Bug
7323938
Change-Id: I2335d24fd7b0f00bb23fc63aa7bcf44cb8857c73
The Android Automerger [Wed, 10 Oct 2012 21:06:39 +0000 (14:06 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Chet Haase [Mon, 8 Oct 2012 20:19:08 +0000 (13:19 -0700)]
Revert "Add GL Error logs (temporary)"
This reverts commit
2da2c15068327a4fdad411f638905abcb2209d8a.
The Android Automerger [Wed, 10 Oct 2012 15:55:31 +0000 (08:55 -0700)]
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 10 Oct 2012 13:59:29 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Mathias Agopian [Tue, 9 Oct 2012 23:52:37 +0000 (16:52 -0700)]
Merge "fix typo that prevented proper loging of EGL error code" into jb-mr1-dev
Jeff Brown [Tue, 9 Oct 2012 23:50:55 +0000 (16:50 -0700)]
Merge "don't automatically unblank external displays" into jb-mr1-dev
Mathias Agopian [Tue, 9 Oct 2012 23:43:50 +0000 (16:43 -0700)]
fix typo that prevented proper loging of EGL error code
needed for investigating
7309949
Bug:
7309949
Change-Id: If29a5c08d0e87f46b44ba2e1030be61cb4d1403b
Mathias Agopian [Tue, 9 Oct 2012 23:36:30 +0000 (16:36 -0700)]
Merge "Fence didn't manager sync_wait error codes properly" into jb-mr1-dev
Mathias Agopian [Mon, 8 Oct 2012 22:12:36 +0000 (15:12 -0700)]
don't automatically unblank external displays
this should be handled by the display-manager. we were doing
that in SF because until recently we didn't have enough support
in the HAL. however, this is now causing other problems when
plugging hdmi while the screen is off for instance.
Bug:
7150885
Change-Id: I739b209056a765d38d05295cf202f67ee0f506ae
Mathias Agopian [Tue, 9 Oct 2012 21:38:19 +0000 (14:38 -0700)]
Fence didn't manager sync_wait error codes properly
error codes are returned in errno, this caused ::waitForwever()
to only wait for 1 second and return improper error code (-1).
needed to help debugging
7316632
Bug:
7316632
Change-Id: Ie144f614a88393393972a3a770c6b4b0581f961a
The Android Automerger [Tue, 9 Oct 2012 13:59:29 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jeff Brown [Tue, 9 Oct 2012 02:13:57 +0000 (19:13 -0700)]
Add blankDisplay/unblankDisplay to SurfaceComposerClient.
Bug:
7309812
Change-Id: Ia401d642094a46c62f0d26c65da1d11341e203a1
Mathias Agopian [Thu, 4 Oct 2012 22:58:54 +0000 (15:58 -0700)]
fix dumpsys Layer name when using multiple displays
Bug:
7288401
Change-Id: I14beeef58fac5270cef3b611e18c163060efe6c3
The Android Automerger [Mon, 8 Oct 2012 01:58:06 +0000 (18:58 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Mathias Agopian [Sun, 7 Oct 2012 23:41:12 +0000 (16:41 -0700)]
fix SurfaceFlinger DDMS debugging
DdmHandleAppName.setAppName() signature changed which broke
this debugging feature.
Needed for debugging b\
7267680
Change-Id: I4482bf5a441e91bef89d1ddea9a4152333be7f88
The Android Automerger [Sun, 7 Oct 2012 13:59:27 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Dave Burke [Sun, 7 Oct 2012 08:06:14 +0000 (01:06 -0700)]
Merge "Revert "ugly, temporary, workaroung for a problem where a binder thread spins forever"" into jb-mr1-dev
Dave Burke [Sun, 7 Oct 2012 06:20:00 +0000 (23:20 -0700)]
Revert "ugly, temporary, workaroung for a problem where a binder thread spins forever"
This reverts commit
0845d0245e09548110cacb0f20e9934753388aab
Change-Id: I395037cb9427cd11f7de6bb78fbdfa917fc6263a
Mathias Agopian [Sat, 6 Oct 2012 00:28:04 +0000 (17:28 -0700)]
ugly, temporary, workaroung for a problem where a binder thread spins forever
Bug:
7289992
Change-Id: I0c3d482a1af57e5f444be2ba7f2751ac3e954af2
Dave Burke [Sat, 6 Oct 2012 06:25:57 +0000 (23:25 -0700)]
Merge "ugly, temporary, workaroung for a problem where a binder thread spins forever" into jb-mr1-dev
Mathias Agopian [Sat, 6 Oct 2012 00:28:04 +0000 (17:28 -0700)]
ugly, temporary, workaroung for a problem where a binder thread spins forever
Bug:
7289992
Change-Id: I0c3d482a1af57e5f444be2ba7f2751ac3e954af2
Jesse Hall [Fri, 5 Oct 2012 21:34:21 +0000 (14:34 -0700)]
Fix race condition in ConsumerBase::addReleaseFence()
This needs the ConsumerBase mutex locked, but wasn't locking it. Two
of the four places that called it already held the lock so were fine.
Now addReleaseFence() takes the lock itself, and I added
addReleaseFenceLocked() for the two already-locked callers, since in
one of them dropping the lock would be inconvenient.
Bug:
7289269
Change-Id: I7a5628adb516f8eec782aa6c14128202f96d7b0a
The Android Automerger [Fri, 5 Oct 2012 13:59:39 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Stephen Hines [Fri, 5 Oct 2012 04:42:29 +0000 (21:42 -0700)]
Merge "Fix missing parens in CleanSpec.mk." into jb-mr1-dev
Mathias Agopian [Fri, 5 Oct 2012 03:24:17 +0000 (20:24 -0700)]
Merge "Tone down a fatal assert" into jb-mr1-dev
Stephen Hines [Thu, 4 Oct 2012 18:38:41 +0000 (11:38 -0700)]
Fix missing parens in CleanSpec.mk.
Change-Id: I0440a942d3e685d619ec9cc402d3293cb3f52df1
Chet Haase [Fri, 5 Oct 2012 02:45:16 +0000 (19:45 -0700)]
Merge "Add GL Error logs (temporary)" into jb-mr1-dev
Andy McFadden [Fri, 5 Oct 2012 02:09:45 +0000 (19:09 -0700)]
Tone down a fatal assert
The new disconnectDisplay function doesn't handle virtual displays,
but it may be called for them. Return without doing anything.
Bug
7281786
Change-Id: I62607f2ae6073fa66b393f55932604aeb8e03566
Raph Levien [Fri, 5 Oct 2012 02:00:45 +0000 (19:00 -0700)]
Fix broken CleanSpec.mk in libs/gui
The CleanSpec is missing parens, which causes $P to be interpreted as a
single variable, and the following printed to the log:
Clean step: rm -rf RODUCT_OUT/obj/SHARED_LIBRARIES/libgui_intermediates
This patch adds parens as needed.
Change-Id: I587998fa67a4884418c286360a577cdbb6ea9a21
Mathias Agopian [Thu, 4 Oct 2012 09:34:38 +0000 (02:34 -0700)]
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
Chet Haase [Fri, 5 Oct 2012 00:15:59 +0000 (17:15 -0700)]
Add GL Error logs (temporary)
Adding logs to tell which specific methods throw OpenGL errors.
Change-Id: I1d73c7566ed1ea6610392020411762c6255a0ede
Jesse Hall [Thu, 4 Oct 2012 23:29:19 +0000 (16:29 -0700)]
Ignore display state changes for disconnected displays
When a display is disconnected, removing it from SurfaceFlinger's
display list is non-atomic with removing it from the Display Manager
and any in-flight transactions. So SurfaceFlinger might get a display
state change transaction for a display it has already forgotten about.
Just ignore these.
Bug:
7288082
Change-Id: Ic27e55377f3db40fb34e3b1cd67e43297df117a2
Mathias Agopian [Thu, 4 Oct 2012 09:34:38 +0000 (02:34 -0700)]
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
Andy McFadden [Wed, 3 Oct 2012 02:04:45 +0000 (19:04 -0700)]
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
The Android Automerger [Thu, 4 Oct 2012 13:59:43 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Andy McFadden [Wed, 3 Oct 2012 02:04:45 +0000 (19:04 -0700)]
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
Dianne Hackborn [Wed, 3 Oct 2012 16:43:01 +0000 (09:43 -0700)]
Fix issue #
7271589: Cannot set Ocean HD live wallpaper
Change-Id: Id7662c503815293040c240232a6622bd6f6eab37
Jamie Gennis [Fri, 28 Sep 2012 00:58:24 +0000 (17:58 -0700)]
libgui: enable fence support for exynos5
Change-Id: Iffc48412b8c951116a956a3ac7dab8d75eed13da
Bug:
7238122