OSDN Git Service
Kenny Root [Sat, 13 Oct 2012 06:45:02 +0000 (23:45 -0700)]
am
e2e95c8c: am
9bdaa60b: Merge "Add TEMP_FAILURE_RETRY around open and write calls" into jb-mr1-dev
* commit '
e2e95c8ccba2c2fb979d0ed42ed905106623d3c3':
Add TEMP_FAILURE_RETRY around open and write calls
Kenny Root [Sat, 13 Oct 2012 06:43:29 +0000 (23:43 -0700)]
am
9bdaa60b: Merge "Add TEMP_FAILURE_RETRY around open and write calls" into jb-mr1-dev
* commit '
9bdaa60b809b223d14619d1f13afdd38acb1738d':
Add TEMP_FAILURE_RETRY around open and write calls
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
Jamie Gennis [Fri, 12 Oct 2012 21:39:54 +0000 (14:39 -0700)]
am
ec93e762: am
dd57d551: Merge "SurfaceFlinger: make the num FBs a board config" into jb-mr1-dev
* commit '
ec93e762afc46534aadb3f583dbf87e38e85bfe9':
SurfaceFlinger: make the num FBs a board config
Jamie Gennis [Fri, 12 Oct 2012 21:37:22 +0000 (14:37 -0700)]
am
dd57d551: Merge "SurfaceFlinger: make the num FBs a board config" into jb-mr1-dev
* commit '
dd57d551944c01394bc2807d962be4953c58c7c1':
SurfaceFlinger: make the num FBs a board config
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 Open Source Project [Fri, 12 Oct 2012 14:33:36 +0000 (07:33 -0700)]
am
c5a70b1d: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
c5a70b1d2474f47929658b90f51390de700d64c0':
The Android Open Source Project [Fri, 12 Oct 2012 14:31:00 +0000 (07:31 -0700)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I38012327dc2f36e7e2a6773a2e1dfc49be6475ad
Jesse Hall [Fri, 12 Oct 2012 00:54:35 +0000 (17:54 -0700)]
am
f5b27f71: am
b763d5ff: Assume LayerScreenshot has pre-multiplied alpha
* commit '
f5b27f714063361d07a7ca6f107bba3e13b75d38':
Assume LayerScreenshot has pre-multiplied alpha
Jesse Hall [Fri, 12 Oct 2012 00:13:23 +0000 (17:13 -0700)]
am
b763d5ff: Assume LayerScreenshot has pre-multiplied alpha
* commit '
b763d5fffa2f942a6ae3637fab17439dd32dbebc':
Assume LayerScreenshot has pre-multiplied alpha
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
Jesse Hall [Thu, 11 Oct 2012 22:41:48 +0000 (15:41 -0700)]
am
42bac0bd: (-s ours) am
b82fb343: (-s ours) am
e3a66965: (-s ours) Merge "Stop using transparent region for computing visible regions (DO NOT MERGE)"
* commit '
42bac0bd1c4e1ef964d37a480d068cfc29310297':
Stop using transparent region for computing visible regions (DO NOT MERGE)
Jesse Hall [Thu, 11 Oct 2012 22:40:40 +0000 (15:40 -0700)]
am
b82fb343: (-s ours) am
e3a66965: (-s ours) Merge "Stop using transparent region for computing visible regions (DO NOT MERGE)"
* commit '
b82fb3431e5d62298b229f3b8758c832dee41f1d':
Stop using transparent region for computing visible regions (DO NOT MERGE)
Jesse Hall [Thu, 11 Oct 2012 22:39:34 +0000 (15:39 -0700)]
am
e3a66965: (-s ours) Merge "Stop using transparent region for computing visible regions (DO NOT MERGE)"
* commit '
e3a669656ae891a510ccbd73d26559a20f5f466b':
Stop using transparent region for computing visible regions (DO NOT MERGE)
Jesse Hall [Thu, 11 Oct 2012 22:06:07 +0000 (15:06 -0700)]
Merge "Stop using transparent region for computing visible regions (DO NOT MERGE)"
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 Open Source Project [Thu, 11 Oct 2012 15:08:16 +0000 (08:08 -0700)]
am
9e7f65fd: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
9e7f65fdc941f9e35faddc5d117bcb40aa91b09a':
The Android Open Source Project [Thu, 11 Oct 2012 15:04:59 +0000 (08:04 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Ie746268888d072f9a5bf32320bebc98afdc0ef8b
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
The Android Open Source Project [Thu, 11 Oct 2012 12:59:16 +0000 (05:59 -0700)]
am
ca5aae24: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
ca5aae2425a88ddc0bdf7f03569848fd67e603d2':
The Android Open Source Project [Thu, 11 Oct 2012 12:57:17 +0000 (05:57 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I01ed0fa73e80b3868a53238a8e754970da2f6803
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:39:21 +0000 (19:39 -0700)]
am
9349b510: am
f0c89b28: Merge "Fix HDMI unblank behavior" into jb-mr1-dev
* commit '
9349b5108c3763337868ffc5de51330c00d6db04':
Fix HDMI unblank behavior
Andy McFadden [Thu, 11 Oct 2012 02:37:57 +0000 (19:37 -0700)]
am
f0c89b28: Merge "Fix HDMI unblank behavior" into jb-mr1-dev
* commit '
f0c89b28be2e74c26d74b2a21b7228516f8c236f':
Fix HDMI unblank behavior
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
Siva Velusamy [Wed, 10 Oct 2012 21:02:55 +0000 (14:02 -0700)]
Merge "gltrace: Do not start gltrace from early_egl_init."
Chet Haase [Wed, 10 Oct 2012 20:22:55 +0000 (13:22 -0700)]
am
8b75830c: am
8d5d2019: Revert "Add GL Error logs (temporary)"
* commit '
8b75830c5ce5e0097909c11c559d50d7f6f7303b':
Revert "Add GL Error logs (temporary)"
Chet Haase [Wed, 10 Oct 2012 20:21:39 +0000 (13:21 -0700)]
am
8d5d2019: Revert "Add GL Error logs (temporary)"
* commit '
8d5d2019805df1f27cbec07eeca47dd5ab453dad':
Revert "Add GL Error logs (temporary)"
Chet Haase [Mon, 8 Oct 2012 20:19:08 +0000 (13:19 -0700)]
Revert "Add GL Error logs (temporary)"
This reverts commit
2da2c15068327a4fdad411f638905abcb2209d8a.
Siva Velusamy [Wed, 10 Oct 2012 17:35:41 +0000 (10:35 -0700)]
gltrace: Do not start gltrace from early_egl_init.
The debugging and tracing levels are initialized both during
early_egl_init and egl_display_t::initialize(). For apps this has
no effect since early_egl_init is called in the context of zygote.
This CL removes the unnecessary call from early_egl_init.
Change-Id: Ibc55c26228cd197f2e2623fbfb2d1a63d0722401
The Android Open Source Project [Wed, 10 Oct 2012 16:47:52 +0000 (09:47 -0700)]
am
dc9c3a4f: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
dc9c3a4f2bdd2825e396cb01eafb06122ceea257':
The Android Open Source Project [Wed, 10 Oct 2012 16:44:41 +0000 (09:44 -0700)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I9b2354f718f8e792bd040b7fb92f8fd1c77c037a
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:59:54 +0000 (16:59 -0700)]
am
43bd832d: am
0acb00c2: Merge "fix typo that prevented proper loging of EGL error code" into jb-mr1-dev
* commit '
43bd832d128726334de622d67aaac09051c07941':
fix typo that prevented proper loging of EGL error code
Jeff Brown [Tue, 9 Oct 2012 23:58:27 +0000 (16:58 -0700)]
am
70f07572: am
c5b58166: Merge "don\'t automatically unblank external displays" into jb-mr1-dev
* commit '
70f07572f8ce6b83b167170eea9d500e51549395':
don't automatically unblank external displays
Mathias Agopian [Tue, 9 Oct 2012 23:57:47 +0000 (16:57 -0700)]
am
0acb00c2: Merge "fix typo that prevented proper loging of EGL error code" into jb-mr1-dev
* commit '
0acb00c2d780b60ed3d71be256460375dd8715b4':
fix typo that prevented proper loging of EGL error code
Jeff Brown [Tue, 9 Oct 2012 23:56:21 +0000 (16:56 -0700)]
am
c5b58166: Merge "don\'t automatically unblank external displays" into jb-mr1-dev
* commit '
c5b58166e8170a415de108a72acfc432dec1b201':
don't automatically unblank external displays
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:41:44 +0000 (16:41 -0700)]
am
98e52bdb: am
45778999: Merge "Fence didn\'t manager sync_wait error codes properly" into jb-mr1-dev
* commit '
98e52bdb18842a7a00e66bf6adb628f2512e2ef0':
Fence didn't manager sync_wait error codes properly
Mathias Agopian [Tue, 9 Oct 2012 23:40:08 +0000 (16:40 -0700)]
am
45778999: Merge "Fence didn\'t manager sync_wait error codes properly" into jb-mr1-dev
* commit '
45778999c705683ec0fcca3e90c7e9969e081d93':
Fence didn't manager sync_wait error codes properly
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 Open Source Project [Tue, 9 Oct 2012 14:31:52 +0000 (07:31 -0700)]
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
The Android Open Source Project [Tue, 9 Oct 2012 14:29:23 +0000 (07:29 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I94b8cbf30ab7707320dc2de4ef8a8102ed5f6091
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 07:05:56 +0000 (00:05 -0700)]
am
e3a8cd4d: am
2a09bb32: Add blankDisplay/unblankDisplay to SurfaceComposerClient.
* commit '
e3a8cd4db13494400a88da88f2e0190f5d286011':
Add blankDisplay/unblankDisplay to SurfaceComposerClient.
Jeff Brown [Tue, 9 Oct 2012 07:04:34 +0000 (00:04 -0700)]
am
2a09bb32: Add blankDisplay/unblankDisplay to SurfaceComposerClient.
* commit '
2a09bb321930e1f782599ec902bca1db58b9af77':
Add blankDisplay/unblankDisplay to SurfaceComposerClient.
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 [Mon, 8 Oct 2012 23:23:08 +0000 (16:23 -0700)]
am
1a003e4a: am
cb55857b: fix dumpsys Layer name when using multiple displays
* commit '
1a003e4aec1c4ffc2b11c8b9f05f69db6280987c':
fix dumpsys Layer name when using multiple displays
Mathias Agopian [Mon, 8 Oct 2012 23:12:12 +0000 (16:12 -0700)]
am
cb55857b: fix dumpsys Layer name when using multiple displays
* commit '
cb55857bbde34a06c19dde3db5064d1717a0173e':
fix dumpsys Layer name when using multiple displays
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
Jesse Hall [Mon, 8 Oct 2012 17:39:21 +0000 (10:39 -0700)]
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
Mathias Agopian [Mon, 8 Oct 2012 06:41:57 +0000 (23:41 -0700)]
am
eb38d852: am
1b3aeb48: fix SurfaceFlinger DDMS debugging
* commit '
eb38d85260073470e5a27af820fe6cd9f2bc35ae':
fix SurfaceFlinger DDMS debugging
Mathias Agopian [Mon, 8 Oct 2012 06:38:32 +0000 (23:38 -0700)]
am
1b3aeb48: fix SurfaceFlinger DDMS debugging
* commit '
1b3aeb4844fe198c1fb61064d0cec3f5ac63f7d3':
fix SurfaceFlinger DDMS debugging
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
Dave Burke [Sun, 7 Oct 2012 16:10:03 +0000 (09:10 -0700)]
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"
Dave Burke [Sun, 7 Oct 2012 16:07:12 +0000 (09:07 -0700)]
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"
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:31:33 +0000 (23:31 -0700)]
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
Dave Burke [Sat, 6 Oct 2012 06:29:35 +0000 (23:29 -0700)]
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
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 22:22:09 +0000 (15:22 -0700)]
am
d22e4b91: am
9504eb91: Fix race condition in ConsumerBase::addReleaseFence()
* commit '
d22e4b914c01342c09ef2e0279dc705fe6f7f753':
Fix race condition in ConsumerBase::addReleaseFence()
Jesse Hall [Fri, 5 Oct 2012 22:21:21 +0000 (15:21 -0700)]
am
9504eb91: Fix race condition in ConsumerBase::addReleaseFence()
* commit '
9504eb915c9628e130f45019bdefda0168089886':
Fix race condition in ConsumerBase::addReleaseFence()
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
Jean-Baptiste Queru [Fri, 5 Oct 2012 20:25:07 +0000 (13:25 -0700)]
am
659ad445: am
f29b86b2: (-s ours) am
76942a49: Merge "egl: Reintroduce eglGetRenderBufferANDROID"
* commit '
659ad445589b0a9e0e746b5d5a4ba595204ad2e0':
egl: Reintroduce eglGetRenderBufferANDROID
Jean-Baptiste Queru [Fri, 5 Oct 2012 20:23:20 +0000 (13:23 -0700)]
am
f29b86b2: (-s ours) am
76942a49: Merge "egl: Reintroduce eglGetRenderBufferANDROID"
* commit '
f29b86b26aad5f50c2cae829bcce55fbb9fd8f8b':
egl: Reintroduce eglGetRenderBufferANDROID
Jean-Baptiste Queru [Fri, 5 Oct 2012 20:19:56 +0000 (13:19 -0700)]
am
76942a49: Merge "egl: Reintroduce eglGetRenderBufferANDROID"
* commit '
76942a49740d6cf53fc5fe3c5a53f4de4011d954':
egl: Reintroduce eglGetRenderBufferANDROID
Jean-Baptiste Queru [Fri, 5 Oct 2012 20:14:29 +0000 (13:14 -0700)]
Merge "egl: Reintroduce eglGetRenderBufferANDROID"
The Android Open Source Project [Fri, 5 Oct 2012 15:20:35 +0000 (08:20 -0700)]
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
The Android Open Source Project [Fri, 5 Oct 2012 15:16:53 +0000 (08:16 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I6f2d20f646b742314b143f863957623169732bef
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:48:33 +0000 (21:48 -0700)]
am
ecbcc4ca: am
0e8fcc2c: Merge "Fix missing parens in CleanSpec.mk." into jb-mr1-dev
* commit '
ecbcc4cadb52bd501788c45f7cbfff9a503e2b12':
Fix missing parens in CleanSpec.mk.
Stephen Hines [Fri, 5 Oct 2012 04:47:04 +0000 (21:47 -0700)]
am
0e8fcc2c: Merge "Fix missing parens in CleanSpec.mk." into jb-mr1-dev
* commit '
0e8fcc2c27f278478483ebbe1befe1460e8bbed1':
Fix missing parens in CleanSpec.mk.
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:34:46 +0000 (20:34 -0700)]
am
95b9a0b6: am
e835976d: Merge "Tone down a fatal assert" into jb-mr1-dev
* commit '
95b9a0b688eab5a3c0c1fadb71e258e93e4c344c':
Tone down a fatal assert
Chet Haase [Fri, 5 Oct 2012 03:34:36 +0000 (20:34 -0700)]
am
9c58d96f: am
27b28fd9: Merge "Add GL Error logs (temporary)" into jb-mr1-dev
* commit '
9c58d96f0079e627004c606436df27fa97ff4c8e':
Add GL Error logs (temporary)
Raph Levien [Fri, 5 Oct 2012 03:34:23 +0000 (20:34 -0700)]
am
dca9d135: am
3fbbd076: Fix broken CleanSpec.mk in libs/gui
* commit '
dca9d13581d4d14701d8a207ed647c94ffb1778c':
Fix broken CleanSpec.mk in libs/gui
Mathias Agopian [Fri, 5 Oct 2012 03:26:52 +0000 (20:26 -0700)]
am
e835976d: Merge "Tone down a fatal assert" into jb-mr1-dev
* commit '
e835976d285df80e261546bd4d016dadb45d906d':
Tone down a fatal assert
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:48:12 +0000 (19:48 -0700)]
am
27b28fd9: Merge "Add GL Error logs (temporary)" into jb-mr1-dev
* commit '
27b28fd9960b73a1f13e22dd6655f75e2e76eef7':
Add GL Error logs (temporary)
Chet Haase [Fri, 5 Oct 2012 02:45:16 +0000 (19:45 -0700)]
Merge "Add GL Error logs (temporary)" into jb-mr1-dev
Raph Levien [Fri, 5 Oct 2012 02:37:42 +0000 (19:37 -0700)]
am
3fbbd076: Fix broken CleanSpec.mk in libs/gui
* commit '
3fbbd076ad571810d9107ed870cfce2e8c062d10':
Fix broken CleanSpec.mk in libs/gui
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
Jesse Hall [Fri, 5 Oct 2012 01:01:50 +0000 (18:01 -0700)]
am
3b4e55c0: am
9a143922: Ignore display state changes for disconnected displays
* commit '
3b4e55c0442322823898dd838cb50fe589e1e9d7':
Ignore display state changes for disconnected displays
OSDN Git Service
