45778999c7
Merge "Fence didn't manager sync_wait error codes properly" into jb-mr1-dev
2012-10-09 16:36:30 -07:00
3292cae8c3
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
2012-10-09 14:49:01 -07:00
b5c9dcdf3b
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
2012-10-09 14:38:19 -07:00
7c49c030eb
am 7776457d: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '7776457df5639aef8e836cded2de28118e2841da':
ugly, temporary, workaroung for a problem where a binder thread spins forever
2012-10-09 07:31:52 -07:00
7776457df5
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I94b8cbf30ab7707320dc2de4ef8a8102ed5f6091
2012-10-09 07:29:23 -07:00
c0609a2743
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-09 06:59:29 -07:00
60a3a751d7
am e3a8cd4d: am 2a09bb32: Add blankDisplay/unblankDisplay to SurfaceComposerClient.
...
* commit 'e3a8cd4db13494400a88da88f2e0190f5d286011':
Add blankDisplay/unblankDisplay to SurfaceComposerClient.
2012-10-09 00:05:56 -07:00
e3a8cd4db1
am 2a09bb32: Add blankDisplay/unblankDisplay to SurfaceComposerClient.
...
* commit '2a09bb321930e1f782599ec902bca1db58b9af77':
Add blankDisplay/unblankDisplay to SurfaceComposerClient.
2012-10-09 00:04:34 -07:00
2a09bb3219
Add blankDisplay/unblankDisplay to SurfaceComposerClient.
...
Bug: 7309812
Change-Id: Ia401d642094a46c62f0d26c65da1d11341e203a1
2012-10-08 19:13:57 -07:00
8a34643a33
am 1a003e4a: am cb55857b: fix dumpsys Layer name when using multiple displays
...
* commit '1a003e4aec1c4ffc2b11c8b9f05f69db6280987c':
fix dumpsys Layer name when using multiple displays
2012-10-08 16:23:08 -07:00
1a003e4aec
am cb55857b: fix dumpsys Layer name when using multiple displays
...
* commit 'cb55857bbde34a06c19dde3db5064d1717a0173e':
fix dumpsys Layer name when using multiple displays
2012-10-08 16:12:12 -07:00
cb55857bbd
fix dumpsys Layer name when using multiple displays
...
Bug: 7288401
Change-Id: I14beeef58fac5270cef3b611e18c163060efe6c3
2012-10-08 15:57:17 -07:00
0de75f3f53
Stop using transparent region for computing visible regions (DO NOT MERGE)
...
The transparent region hint is computed only from view layout
locations, ignoring post-layout translation. If a SurfaceView is layed
out with no other views above it, but a view is moved above it
post-layout, that view's layout bounds would be subtracted from the
window's transparent region instead of its drawing bounds. Prior to
this change, the view would not be visible (except where its layout
bounds and drawing bounds overlap).
With this change, composition uses visible regions computed without
regard to the transparent regions. However, if all of a layer's
visible region is transparent, it will be removed from the list of
layers to composite. This doesn't fix the root problem of incorrect
transparent regions, and doesn't prevent bad composition in all cases.
But it does avoid it for some existing apps, while still allowing the
transparent region hint to save power in the important
fullscreen-video-in-a-SurfaceView case.
Change-Id: If2d929a10399b80401ef902abb232233a7f3d16d
2012-10-08 10:56:03 -07:00
4dae9ebd80
am eb38d852: am 1b3aeb48: fix SurfaceFlinger DDMS debugging
...
* commit 'eb38d85260073470e5a27af820fe6cd9f2bc35ae':
fix SurfaceFlinger DDMS debugging
2012-10-07 23:41:57 -07:00
eb38d85260
am 1b3aeb48: fix SurfaceFlinger DDMS debugging
...
* commit '1b3aeb4844fe198c1fb61064d0cec3f5ac63f7d3':
fix SurfaceFlinger DDMS debugging
2012-10-07 23:38:32 -07:00
60b974f657
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-07 18:58:06 -07:00
1b3aeb4844
fix SurfaceFlinger DDMS debugging
...
DdmHandleAppName.setAppName() signature changed which broke
this debugging feature.
Needed for debugging b\7267680
Change-Id: I4482bf5a441e91bef89d1ddea9a4152333be7f88
2012-10-07 16:41:12 -07:00
f8aad32c8c
am c431c36e: am 6d24eef4: Merge "Revert "ugly, temporary, workaroung for a problem where a binder thread spins forever"" into jb-mr1-dev
...
* commit 'c431c36ed30d4c01af58e67e17f53caf8be581b6':
Revert "ugly, temporary, workaroung for a problem where a binder thread spins forever"
2012-10-07 09:10:03 -07:00
c431c36ed3
am 6d24eef4: Merge "Revert "ugly, temporary, workaroung for a problem where a binder thread spins forever"" into jb-mr1-dev
...
* commit '6d24eef4b6443afa8d361437c0a3a575b69609ae':
Revert "ugly, temporary, workaroung for a problem where a binder thread spins forever"
2012-10-07 09:07:12 -07:00
6e218edaa2
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-07 06:59:27 -07:00
6d24eef4b6
Merge "Revert "ugly, temporary, workaroung for a problem where a binder thread spins forever"" into jb-mr1-dev
2012-10-07 01:06:15 -07:00
0bed1f541d
Revert "ugly, temporary, workaroung for a problem where a binder thread spins forever"
...
This reverts commit 0845d0245e
2012-10-06 23:20:00 -07:00
3e9f3b67b1
ugly, temporary, workaroung for a problem where a binder thread spins forever
...
Bug: 7289992
Change-Id: I0c3d482a1af57e5f444be2ba7f2751ac3e954af2
2012-10-06 00:39:26 -07:00
dec6db5b47
am f7576400: am dba919c5: Merge "ugly, temporary, workaroung for a problem where a binder thread spins forever" into jb-mr1-dev
...
* commit 'f757640049a2ae19ba5047362f7fee47d9fb8ab7':
ugly, temporary, workaroung for a problem where a binder thread spins forever
2012-10-05 23:31:33 -07:00
f757640049
am dba919c5: Merge "ugly, temporary, workaroung for a problem where a binder thread spins forever" into jb-mr1-dev
...
* commit 'dba919c5f372872179cd14f8b5beeb4c22fe23c1':
ugly, temporary, workaroung for a problem where a binder thread spins forever
2012-10-05 23:29:35 -07:00
dba919c5f3
Merge "ugly, temporary, workaroung for a problem where a binder thread spins forever" into jb-mr1-dev
2012-10-05 23:25:57 -07:00
0845d0245e
ugly, temporary, workaroung for a problem where a binder thread spins forever
...
Bug: 7289992
Change-Id: I0c3d482a1af57e5f444be2ba7f2751ac3e954af2
2012-10-05 17:28:04 -07:00
e39dee276e
am d22e4b91: am 9504eb91: Fix race condition in ConsumerBase::addReleaseFence()
...
* commit 'd22e4b914c01342c09ef2e0279dc705fe6f7f753':
Fix race condition in ConsumerBase::addReleaseFence()
2012-10-05 15:22:09 -07:00
d22e4b914c
am 9504eb91: Fix race condition in ConsumerBase::addReleaseFence()
...
* commit '9504eb915c9628e130f45019bdefda0168089886':
Fix race condition in ConsumerBase::addReleaseFence()
2012-10-05 15:21:21 -07:00
9504eb915c
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
2012-10-05 14:40:50 -07:00
2ef7871b19
am 659ad445: am f29b86b2: (-s ours) am 76942a49: Merge "egl: Reintroduce eglGetRenderBufferANDROID"
...
* commit '659ad445589b0a9e0e746b5d5a4ba595204ad2e0':
egl: Reintroduce eglGetRenderBufferANDROID
2012-10-05 13:25:07 -07:00
659ad44558
am f29b86b2: (-s ours) am 76942a49: Merge "egl: Reintroduce eglGetRenderBufferANDROID"
...
* commit 'f29b86b26aad5f50c2cae829bcce55fbb9fd8f8b':
egl: Reintroduce eglGetRenderBufferANDROID
2012-10-05 13:23:20 -07:00
f29b86b26a
am 76942a49: Merge "egl: Reintroduce eglGetRenderBufferANDROID"
...
* commit '76942a49740d6cf53fc5fe3c5a53f4de4011d954':
egl: Reintroduce eglGetRenderBufferANDROID
2012-10-05 13:19:56 -07:00
76942a4974
Merge "egl: Reintroduce eglGetRenderBufferANDROID"
2012-10-05 13:14:29 -07:00
6414034394
am feb570e4: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'feb570e404c32753025b3b6e7950db7e8648a248':
make sure we don't call into the HWC HAL when not needed
Fix crashes after HDMI disconnect
2012-10-05 08:20:35 -07:00
feb570e404
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I6f2d20f646b742314b143f863957623169732bef
2012-10-05 08:16:53 -07:00
0f326b9ab2
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-05 06:59:39 -07:00
3019a5fa86
am ecbcc4ca: am 0e8fcc2c: Merge "Fix missing parens in CleanSpec.mk." into jb-mr1-dev
...
* commit 'ecbcc4cadb52bd501788c45f7cbfff9a503e2b12':
Fix missing parens in CleanSpec.mk.
2012-10-04 21:48:33 -07:00
ecbcc4cadb
am 0e8fcc2c: Merge "Fix missing parens in CleanSpec.mk." into jb-mr1-dev
...
* commit '0e8fcc2c27f278478483ebbe1befe1460e8bbed1':
Fix missing parens in CleanSpec.mk.
2012-10-04 21:47:04 -07:00
0e8fcc2c27
Merge "Fix missing parens in CleanSpec.mk." into jb-mr1-dev
2012-10-04 21:42:30 -07:00
8b2a88bad1
am 95b9a0b6: am e835976d: Merge "Tone down a fatal assert" into jb-mr1-dev
...
* commit '95b9a0b688eab5a3c0c1fadb71e258e93e4c344c':
Tone down a fatal assert
2012-10-04 20:34:46 -07:00
b39844e251
am 9c58d96f: am 27b28fd9: Merge "Add GL Error logs (temporary)" into jb-mr1-dev
...
* commit '9c58d96f0079e627004c606436df27fa97ff4c8e':
Add GL Error logs (temporary)
2012-10-04 20:34:36 -07:00
ffe901c2b4
am dca9d135: am 3fbbd076: Fix broken CleanSpec.mk in libs/gui
...
* commit 'dca9d13581d4d14701d8a207ed647c94ffb1778c':
Fix broken CleanSpec.mk in libs/gui
2012-10-04 20:34:23 -07:00
95b9a0b688
am e835976d: Merge "Tone down a fatal assert" into jb-mr1-dev
...
* commit 'e835976d285df80e261546bd4d016dadb45d906d':
Tone down a fatal assert
2012-10-04 20:26:52 -07:00
e835976d28
Merge "Tone down a fatal assert" into jb-mr1-dev
2012-10-04 20:24:17 -07:00
d920670f25
Fix missing parens in CleanSpec.mk.
...
Change-Id: I0440a942d3e685d619ec9cc402d3293cb3f52df1
2012-10-04 20:05:19 -07:00
9c58d96f00
am 27b28fd9: Merge "Add GL Error logs (temporary)" into jb-mr1-dev
...
* commit '27b28fd9960b73a1f13e22dd6655f75e2e76eef7':
Add GL Error logs (temporary)
2012-10-04 19:48:12 -07:00
27b28fd996
Merge "Add GL Error logs (temporary)" into jb-mr1-dev
2012-10-04 19:45:17 -07:00
dca9d13581
am 3fbbd076: Fix broken CleanSpec.mk in libs/gui
...
* commit '3fbbd076ad571810d9107ed870cfce2e8c062d10':
Fix broken CleanSpec.mk in libs/gui
2012-10-04 19:37:42 -07:00
5a8f9012ee
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
2012-10-04 19:09:45 -07:00
Mathias Agopian