Commit Graph

47781 Commits

Author SHA1 Message Date
Kenny Root e2e95c8ccb 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
2012-10-12 23:43:29 -07:00
Kenny Root 9bdaa60b80 Merge "Add TEMP_FAILURE_RETRY around open and write calls" into jb-mr1-dev 2012-10-12 23:39:48 -07:00
The Android Automerger 58b6a67096 merge in jb-mr1-factory-release history after reset to jb-mr1-dev 2012-10-12 16:34:34 -07:00
The Android Automerger 37e0f65619 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-12 16:32:47 -07:00
Jamie Gennis ea5ef70398 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
2012-10-12 14:39:54 -07:00
Jamie Gennis ec93e762af 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
2012-10-12 14:37:22 -07:00
Jamie Gennis dd57d55194 Merge "SurfaceFlinger: make the num FBs a board config" into jb-mr1-dev 2012-10-12 14:33:52 -07:00
Jamie Gennis cdbaecb541 SurfaceFlinger: make the num FBs a board config
Bug: 7283132
Change-Id: I38116f39fc18212f2daab94bbfc3daaf89439fc4
2012-10-12 14:29:12 -07:00
Kenny Root 3de9cd2029 Add TEMP_FAILURE_RETRY around open and write calls
Bug: 7330849
Change-Id: I9aef3c3d3a248c3eea7ca060124ad6decaa6b4da
2012-10-12 11:37:58 -07:00
The Android Automerger 2d358c245f merge in jb-mr1-factory-release history after reset to jb-mr1-dev 2012-10-12 10:26:47 -07:00
The Android Open Source Project 679c895081 am c5a70b1d: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit 'c5a70b1d2474f47929658b90f51390de700d64c0':
2012-10-12 07:33:36 -07:00
The Android Open Source Project c5a70b1d24 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I38012327dc2f36e7e2a6773a2e1dfc49be6475ad
2012-10-12 07:31:01 -07:00
Jamie Gennis 1efe099a51 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
2012-10-11 20:08:26 -07:00
Jesse Hall 570967f6a8 am f5b27f71: am b763d5ff: Assume LayerScreenshot has pre-multiplied alpha
* commit 'f5b27f714063361d07a7ca6f107bba3e13b75d38':
  Assume LayerScreenshot has pre-multiplied alpha
2012-10-11 17:54:35 -07:00
Jesse Hall f5b27f7140 am b763d5ff: Assume LayerScreenshot has pre-multiplied alpha
* commit 'b763d5fffa2f942a6ae3637fab17439dd32dbebc':
  Assume LayerScreenshot has pre-multiplied alpha
2012-10-11 17:13:23 -07:00
The Android Automerger a58b6a4bcd merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-11 16:26:37 -07:00
Jesse Hall ca5c0ddd86 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)
2012-10-11 15:41:48 -07:00
Jesse Hall 42bac0bd1c 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)
2012-10-11 15:40:40 -07:00
Jesse Hall b82fb3431e 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)
2012-10-11 15:39:34 -07:00
Jesse Hall e3a669656a Merge "Stop using transparent region for computing visible regions (DO NOT MERGE)" 2012-10-11 15:06:07 -07:00
The Android Automerger 8b4053a1aa merge in jb-mr1-factory-release history after reset to jb-mr1-dev 2012-10-11 08:19:15 -07:00
The Android Open Source Project 83ae5807e2 am 9e7f65fd: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '9e7f65fdc941f9e35faddc5d117bcb40aa91b09a':
2012-10-11 08:08:16 -07:00
The Android Open Source Project 9e7f65fdc9 Reconcile with jb-mr1-release - do not merge
Change-Id: Ie746268888d072f9a5bf32320bebc98afdc0ef8b
2012-10-11 08:04:59 -07:00
The Android Automerger 0c1c3948d3 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-11 07:03:50 -07:00
The Android Open Source Project 8c60e0e365 am ca5aae24: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'ca5aae2425a88ddc0bdf7f03569848fd67e603d2':
2012-10-11 05:59:16 -07:00
The Android Open Source Project ca5aae2425 Reconcile with jb-mr1-release - do not merge
Change-Id: I01ed0fa73e80b3868a53238a8e754970da2f6803
2012-10-11 05:57:17 -07:00
Jesse Hall b763d5fffa Assume LayerScreenshot has pre-multiplied alpha
Bug: 7300129
Change-Id: Ie9114adc4b5c9a8cc3c65bfe6d9478b2cba4e0d8
2012-10-10 21:40:26 -07:00
Andy McFadden 9f997217cf am 9349b510: am f0c89b28: Merge "Fix HDMI unblank behavior" into jb-mr1-dev
* commit '9349b5108c3763337868ffc5de51330c00d6db04':
  Fix HDMI unblank behavior
2012-10-10 19:39:21 -07:00
Andy McFadden 9349b5108c am f0c89b28: Merge "Fix HDMI unblank behavior" into jb-mr1-dev
* commit 'f0c89b28be2e74c26d74b2a21b7228516f8c236f':
  Fix HDMI unblank behavior
2012-10-10 19:37:57 -07:00
Andy McFadden f0c89b28be Merge "Fix HDMI unblank behavior" into jb-mr1-dev 2012-10-10 19:34:11 -07:00
Andy McFadden 9e9689c111 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
2012-10-10 18:17:51 -07:00
The Android Automerger a9e3004d69 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-10 14:06:39 -07:00
Siva Velusamy c6e8452320 Merge "gltrace: Do not start gltrace from early_egl_init." 2012-10-10 14:02:55 -07:00
Chet Haase 8420c5fbe8 am 8b75830c: am 8d5d2019: Revert "Add GL Error logs (temporary)"
* commit '8b75830c5ce5e0097909c11c559d50d7f6f7303b':
  Revert "Add GL Error logs (temporary)"
2012-10-10 13:22:55 -07:00
Chet Haase 8b75830c5c am 8d5d2019: Revert "Add GL Error logs (temporary)"
* commit '8d5d2019805df1f27cbec07eeca47dd5ab453dad':
  Revert "Add GL Error logs (temporary)"
2012-10-10 13:21:39 -07:00
Chet Haase 8d5d201980 Revert "Add GL Error logs (temporary)"
This reverts commit 2da2c15068.
2012-10-10 13:10:40 -07:00
Siva Velusamy 2e080904ab 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
2012-10-10 10:35:41 -07:00
The Android Open Source Project 645cab0adb am dc9c3a4f: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit 'dc9c3a4f2bdd2825e396cb01eafb06122ceea257':
2012-10-10 09:47:52 -07:00
The Android Open Source Project dc9c3a4f2b Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I9b2354f718f8e792bd040b7fb92f8fd1c77c037a
2012-10-10 09:44:41 -07:00
The Android Automerger 2de86a4e1b merge in jb-mr1-factory-release history after reset to jb-mr1-dev 2012-10-10 08:55:31 -07:00
The Android Automerger a4927aea77 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-10 06:59:29 -07:00
Mathias Agopian 58deaa8b29 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
2012-10-09 16:59:54 -07:00
Jeff Brown e8fae277fa am 70f07572: am c5b58166: Merge "don\'t automatically unblank external displays" into jb-mr1-dev
* commit '70f07572f8ce6b83b167170eea9d500e51549395':
  don't automatically unblank external displays
2012-10-09 16:58:27 -07:00
Mathias Agopian 43bd832d12 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
2012-10-09 16:57:47 -07:00
Jeff Brown 70f07572f8 am c5b58166: Merge "don\'t automatically unblank external displays" into jb-mr1-dev
* commit 'c5b58166e8170a415de108a72acfc432dec1b201':
  don't automatically unblank external displays
2012-10-09 16:56:21 -07:00
Mathias Agopian 0acb00c2d7 Merge "fix typo that prevented proper loging of EGL error code" into jb-mr1-dev 2012-10-09 16:52:37 -07:00
Jeff Brown c5b58166e8 Merge "don't automatically unblank external displays" into jb-mr1-dev 2012-10-09 16:50:56 -07:00
Mathias Agopian b8fc00bfb4 fix typo that prevented proper loging of EGL error code
needed for investigating 7309949

Bug: 7309949
Change-Id: If29a5c08d0e87f46b44ba2e1030be61cb4d1403b
2012-10-09 16:44:48 -07:00
Mathias Agopian 9acda37df2 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
2012-10-09 16:41:44 -07:00
Mathias Agopian 98e52bdb18 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
2012-10-09 16:40:08 -07:00