OSDN Git Service
Jamie Gennis [Wed, 3 Oct 2012 22:41:46 +0000 (15:41 -0700)]
am
596f5efd: am
3fd12e41: libgui: fix up compile options
* commit '
596f5efd4e0f151f7a33fbe3569551d0c6266728':
libgui: fix up compile options
Jamie Gennis [Wed, 3 Oct 2012 22:39:29 +0000 (15:39 -0700)]
am
3fd12e41: libgui: fix up compile options
* commit '
3fd12e41afcf323fdb99a4cf6bef0f904d72cc8b':
libgui: fix up compile options
Jamie Gennis [Tue, 2 Oct 2012 23:40:30 +0000 (16:40 -0700)]
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
Dianne Hackborn [Wed, 3 Oct 2012 21:04:43 +0000 (14:04 -0700)]
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
Dianne Hackborn [Wed, 3 Oct 2012 20:53:43 +0000 (13:53 -0700)]
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
Dianne Hackborn [Wed, 3 Oct 2012 19:09:12 +0000 (12:09 -0700)]
Merge "Fix issue #
7271589: Cannot set Ocean HD live wallpaper" into jb-mr1-dev
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
The Android Open Source Project [Wed, 3 Oct 2012 14:36:31 +0000 (07:36 -0700)]
am
67091644: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
670916447290d619e4b689d3643f629f058fc244':
The Android Open Source Project [Wed, 3 Oct 2012 14:34:04 +0000 (07:34 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I0c361b5f1fde8ab48360efa3a06ab7d2ccb88370
The Android Automerger [Wed, 3 Oct 2012 13:59:44 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jesse Hall [Tue, 2 Oct 2012 23:36:16 +0000 (16:36 -0700)]
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
Jesse Hall [Tue, 2 Oct 2012 23:35:17 +0000 (16:35 -0700)]
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
Jesse Hall [Mon, 1 Oct 2012 21:05:20 +0000 (14:05 -0700)]
Add Fence::waitForever which logs a warning timeout, and use it
Bug:
7217641
Change-Id: If0c1a613ead307c4045a47824174bf40c72bc7d7
Kenny Root [Tue, 2 Oct 2012 16:57:54 +0000 (09:57 -0700)]
am
7011d5a4: am
ee42072b: am
52f1edb3: Merge "Update tests for new build target"
* commit '
7011d5a46b0b6e5a3cf31949036084c312343b3c':
Update tests for new build target
Kenny Root [Tue, 2 Oct 2012 16:55:49 +0000 (09:55 -0700)]
am
ee42072b: am
52f1edb3: Merge "Update tests for new build target"
* commit '
ee42072bcccab880dd685736a32a56ac62ffc331':
Update tests for new build target
Kenny Root [Tue, 2 Oct 2012 16:54:22 +0000 (09:54 -0700)]
am
52f1edb3: Merge "Update tests for new build target"
* commit '
52f1edb3f11aae1af74a1bfc6f18f81b4d761358':
Update tests for new build target
Kenny Root [Tue, 2 Oct 2012 16:46:28 +0000 (09:46 -0700)]
Merge "Update tests for new build target"
Kenny Root [Tue, 2 Oct 2012 16:09:10 +0000 (09:09 -0700)]
Update tests for new build target
Change-Id: Ia1740d1b2c0b611c4559c5c846b12fb5c3e81b07
The Android Open Source Project [Tue, 2 Oct 2012 16:21:15 +0000 (09:21 -0700)]
am
64a48d28: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
64a48d284c846250e541f350698c10aa1f9c5a50':
Revert "Compatibility work around for bad graphics driver dependency."
The Android Open Source Project [Tue, 2 Oct 2012 16:18:33 +0000 (09:18 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: If7c87d1cb0dc5bb52bb5a6e4b7fa8563c8e30694
The Android Automerger [Tue, 2 Oct 2012 13:59:40 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Mathias Agopian [Tue, 2 Oct 2012 06:39:30 +0000 (23:39 -0700)]
am
8345fb00: (-s ours) am
2ae7bec7: Revert "improve sensor fusion" -- DO NOT MERGE
* commit '
8345fb00edbf71f0e291ff5c1540574f3eb54ecb':
Revert "improve sensor fusion" -- DO NOT MERGE
Mathias Agopian [Tue, 2 Oct 2012 06:35:57 +0000 (23:35 -0700)]
am
2ae7bec7: Revert "improve sensor fusion" -- DO NOT MERGE
* commit '
2ae7bec77093744206080dbae020edfa3bfac2e1':
Revert "improve sensor fusion" -- DO NOT MERGE
Mathias Agopian [Tue, 2 Oct 2012 03:23:55 +0000 (20:23 -0700)]
Revert "improve sensor fusion" -- DO NOT MERGE
This reverts commit
bdf277355dcd647bd5d27b38fc107243a2247a02.
This reverts commit
dc5b63e40ee697324d39fe105d6f12c2bb031fc6.
it might be responsible for a regression that makes the
rotation vector spin.
Bug:
7267330
Change-Id: Ifb10e933537e70c1d85a7ba73a7e3ae59002fe62
Siva Velusamy [Mon, 1 Oct 2012 21:30:48 +0000 (14:30 -0700)]
gltrace: Fix NPE
Change-Id: Id7af9cd388f3508201f96a0624966c2ce01b4da5
Jeff Sharkey [Mon, 1 Oct 2012 20:48:42 +0000 (13:48 -0700)]
am
7006cdfc: am
0c2a25c1: Merge "Include Global table in bugreports." into jb-mr1-dev
* commit '
7006cdfc72bbb58d9460189a691b6b0fe615524b':
Include Global table in bugreports.
Jamie Gennis [Mon, 1 Oct 2012 20:48:09 +0000 (13:48 -0700)]
am
a6f895ee: am
d30b36d1: SurfaceFlinger: reset the FB_TGT acquire fence
* commit '
a6f895ee344a350dad60e74b78539a4d5ba41e52':
SurfaceFlinger: reset the FB_TGT acquire fence
Dianne Hackborn [Mon, 1 Oct 2012 20:47:56 +0000 (13:47 -0700)]
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
Mathias Agopian [Mon, 1 Oct 2012 20:46:10 +0000 (13:46 -0700)]
am
f8e5c37b: am
135e5899: save/restore viewport properly when taking screenshot
* commit '
f8e5c37bc59c70b0a0388f8a690d0d4bead9cc6f':
save/restore viewport properly when taking screenshot
Jeff Sharkey [Mon, 1 Oct 2012 20:11:47 +0000 (13:11 -0700)]
am
0c2a25c1: Merge "Include Global table in bugreports." into jb-mr1-dev
* commit '
0c2a25c11c6688dbc682eabecbdfbc1587ada684':
Include Global table in bugreports.
Jeff Sharkey [Mon, 1 Oct 2012 20:08:21 +0000 (13:08 -0700)]
Merge "Include Global table in bugreports." into jb-mr1-dev
Jeff Sharkey [Mon, 1 Oct 2012 19:52:42 +0000 (12:52 -0700)]
Include Global table in bugreports.
Bug:
7257648
Change-Id: I84c7230fd115cf9d7269bc5367026b52cbcc86ac
Jamie Gennis [Mon, 1 Oct 2012 19:29:34 +0000 (12:29 -0700)]
am
d30b36d1: SurfaceFlinger: reset the FB_TGT acquire fence
* commit '
d30b36d1fd0c7ab80553e784a155266be9703e47':
SurfaceFlinger: reset the FB_TGT acquire fence
Jamie Gennis [Mon, 1 Oct 2012 03:02:03 +0000 (20:02 -0700)]
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
Dianne Hackborn [Mon, 1 Oct 2012 18:42:49 +0000 (11:42 -0700)]
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
Dianne Hackborn [Mon, 1 Oct 2012 18:38:19 +0000 (11:38 -0700)]
Merge "Fix issue #
7257947: Need to fix heap limits on Mako" into jb-mr1-dev
Mathias Agopian [Mon, 1 Oct 2012 17:16:47 +0000 (10:16 -0700)]
am
135e5899: save/restore viewport properly when taking screenshot
* commit '
135e5899f70a67e62baaf6dbec7ba2ce611ca16a':
save/restore viewport properly when taking screenshot
The Android Automerger [Mon, 1 Oct 2012 13:59:20 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Mathias Agopian [Sun, 30 Sep 2012 23:43:20 +0000 (16:43 -0700)]
save/restore viewport properly when taking screenshot
Bug:
7241739
Change-Id: Iba8b9ffc75ab47fbc56169e65da26d96850a9297
Dianne Hackborn [Sun, 30 Sep 2012 23:20:34 +0000 (16:20 -0700)]
Fix issue #
7257947: Need to fix heap limits on Mako
Change-Id: Id8014b19195b8740bccf000ab66c1b599ba3a1a0
The Android Automerger [Sun, 30 Sep 2012 13:59:40 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Mathias Agopian [Fri, 28 Sep 2012 20:41:09 +0000 (13:41 -0700)]
am
f00c34ba: am
bae92d0d: reset GL viewport and project when caputring the screen
* commit '
f00c34babbaacd3b9f27e1a447979a061cab629f':
reset GL viewport and project when caputring the screen
Mathias Agopian [Fri, 28 Sep 2012 20:38:51 +0000 (13:38 -0700)]
am
bae92d0d: reset GL viewport and project when caputring the screen
* commit '
bae92d0d605e99a14731add4f11b72413b2835e5':
reset GL viewport and project when caputring the screen
Mathias Agopian [Fri, 28 Sep 2012 08:00:47 +0000 (01:00 -0700)]
reset GL viewport and project when caputring the screen
Bug:
7241739
Change-Id: I3bb5214b070384de9be2026647865c6c236a4331
Andy McFadden [Fri, 28 Sep 2012 20:10:50 +0000 (13:10 -0700)]
am
bcc1cd16: am
c01a79d7: Pass display arg to blank/unblank
* commit '
bcc1cd161f2bebc9682a3c99ec3c1e53c6cb9bbd':
Pass display arg to blank/unblank
Andy McFadden [Fri, 28 Sep 2012 20:08:42 +0000 (13:08 -0700)]
am
c01a79d7: Pass display arg to blank/unblank
* commit '
c01a79d77b829e7de86ef137694e8ad708470ca1':
Pass display arg to blank/unblank
Andy McFadden [Thu, 27 Sep 2012 23:02:06 +0000 (16:02 -0700)]
Pass display arg to blank/unblank
This allows us to blank and unblank displays other than the built-in
display (e.g. HDMI).
Bug:
7240511
Change-Id: I89ea13f9e497be74c3e1231d0c62fb558e93e0f8
Chet Haase [Fri, 28 Sep 2012 19:42:21 +0000 (12:42 -0700)]
am
bba6bb81: am
4c273277: Merge "Re-enable FAST_TLS in gl2 code" into jb-mr1-dev
* commit '
bba6bb81373b285b456bb851d37f7f2ecfc742ad':
Re-enable FAST_TLS in gl2 code
Chet Haase [Fri, 28 Sep 2012 19:41:24 +0000 (12:41 -0700)]
am
4c273277: Merge "Re-enable FAST_TLS in gl2 code" into jb-mr1-dev
* commit '
4c2732779a11c92222958e7150162d4eaaab7b66':
Re-enable FAST_TLS in gl2 code
Chet Haase [Fri, 28 Sep 2012 19:38:29 +0000 (12:38 -0700)]
Merge "Re-enable FAST_TLS in gl2 code" into jb-mr1-dev
Andreas Huber [Fri, 28 Sep 2012 19:34:50 +0000 (12:34 -0700)]
am
916ce16e: am
589e2e74: Merge "Add a way to configure an OMX encoder to emit SPS/PPS before IDR frames." into jb-mr1-dev
* commit '
916ce16ed41e051c2c443149b2f39bbc3b6b27bd':
Add a way to configure an OMX encoder to emit SPS/PPS before IDR frames.
Andreas Huber [Fri, 28 Sep 2012 19:33:29 +0000 (12:33 -0700)]
am
589e2e74: Merge "Add a way to configure an OMX encoder to emit SPS/PPS before IDR frames." into jb-mr1-dev
* commit '
589e2e74e429f2116f18463aeda9a0954cfd70ca':
Add a way to configure an OMX encoder to emit SPS/PPS before IDR frames.
Andreas Huber [Fri, 28 Sep 2012 19:31:32 +0000 (12:31 -0700)]
Merge "Add a way to configure an OMX encoder to emit SPS/PPS before IDR frames." into jb-mr1-dev
Chet Haase [Fri, 28 Sep 2012 18:56:48 +0000 (11:56 -0700)]
Re-enable FAST_TLS in gl2 code
Temporarily changed USE_FAST_TLS_KEY ifdef during debugging. Changing it
back now.
Change-Id: I7c2fcf7265b3d545e31ff7683bd7614100fad3e5
Andreas Huber [Fri, 28 Sep 2012 18:32:16 +0000 (11:32 -0700)]
Add a way to configure an OMX encoder to emit SPS/PPS before IDR frames.
Change-Id: I71ce254533c8e99bc54d199d8a9828397fe3d99d
related-to-bug:
7245308
Jamie Gennis [Fri, 28 Sep 2012 18:16:59 +0000 (11:16 -0700)]
am
f6760786: am
a4310c8b: SurfaceFlinger: don\'t always set HWC_GEOM_CHGD
* commit '
f6760786136ed46bcc9f71b6211e57a730bd9bf5':
SurfaceFlinger: don't always set HWC_GEOM_CHGD
Jamie Gennis [Fri, 28 Sep 2012 18:14:48 +0000 (11:14 -0700)]
am
a4310c8b: SurfaceFlinger: don\'t always set HWC_GEOM_CHGD
* commit '
a4310c8be2dc3406a668ee99020d52187173232f':
SurfaceFlinger: don't always set HWC_GEOM_CHGD
The Android Automerger [Fri, 28 Sep 2012 13:59:31 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Romain Guy [Fri, 28 Sep 2012 07:35:10 +0000 (00:35 -0700)]
am
e1549fcb: am
cb094a78: Merge "New compile-time flags to make debugging easier for us poor souls Bug #
7195815" into jb-mr1-dev
* commit '
e1549fcb4493fe84deb488d85fc626d635153eb8':
New compile-time flags to make debugging easier for us poor souls Bug #
7195815
Iliyan Malchev [Fri, 28 Sep 2012 07:35:00 +0000 (00:35 -0700)]
am
76d4bd3e: am
38b65726: Revert "Compatibility work around for bad graphics driver dependency."
* commit '
76d4bd3e4232c045f48afc0d4b6ca75dbbd2a148':
Revert "Compatibility work around for bad graphics driver dependency."
The Android Open Source Project [Fri, 28 Sep 2012 07:32:38 +0000 (00:32 -0700)]
am
f76c31ce: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
f76c31ce58ad02e50af916d9e47cce1b68f85edf':
Iliyan Malchev [Thu, 27 Sep 2012 22:08:29 +0000 (15:08 -0700)]
Revert "Compatibility work around for bad graphics driver dependency."
This reverts commit
a50b51c03aca449920fc8581a738032a7bce7150
Change-Id: Ibdcd776a7f241dbb2475403ea04f939249774c41
Jamie Gennis [Wed, 26 Sep 2012 03:26:00 +0000 (20:26 -0700)]
SurfaceFlinger: don't always set HWC_GEOM_CHGD
This change fixes a bug in SurfaceFlinger that caused the HWC_GEOMETRY_CHANGED
flag to be set every flip.
Change-Id: I4f395a2883bcbb53b23b3d14941aff108739c9f0
Bug:
7234237
Romain Guy [Thu, 27 Sep 2012 23:05:31 +0000 (16:05 -0700)]
am
cb094a78: Merge "New compile-time flags to make debugging easier for us poor souls Bug #
7195815" into jb-mr1-dev
* commit '
cb094a783f14daae3378ac8aa7dc509980f037b2':
New compile-time flags to make debugging easier for us poor souls Bug #
7195815
Romain Guy [Thu, 27 Sep 2012 23:04:03 +0000 (16:04 -0700)]
Merge "New compile-time flags to make debugging easier for us poor souls Bug #
7195815" into jb-mr1-dev
Iliyan Malchev [Thu, 27 Sep 2012 22:54:09 +0000 (15:54 -0700)]
am
38b65726: Revert "Compatibility work around for bad graphics driver dependency."
* commit '
38b657265ccc5ae45bd7860a68b0d9373b47a2f3':
Revert "Compatibility work around for bad graphics driver dependency."
Iliyan Malchev [Thu, 27 Sep 2012 22:08:29 +0000 (15:08 -0700)]
Revert "Compatibility work around for bad graphics driver dependency."
This reverts commit
a50b51c03aca449920fc8581a738032a7bce7150
Change-Id: Ibdcd776a7f241dbb2475403ea04f939249774c41
Romain Guy [Thu, 27 Sep 2012 22:47:10 +0000 (15:47 -0700)]
New compile-time flags to make debugging easier for us poor souls
Bug #
7195815
Change-Id: I23e7ac991891b9586cb8ed20b1305c8b1b3e2b43
The Android Open Source Project [Thu, 27 Sep 2012 16:58:04 +0000 (09:58 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I4e21c53aec26d5503f1640cf06acbadcf9eedb59
The Android Automerger [Thu, 27 Sep 2012 13:59:44 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Mathias Agopian [Thu, 27 Sep 2012 01:51:49 +0000 (18:51 -0700)]
am
2ac41948: am
1e83690c: Merge "assert -eng builds when calling a GL function without a context" into jb-mr1-dev
* commit '
2ac4194854a70c6e319b1b3b647344e595082b38':
assert -eng builds when calling a GL function without a context
Mathias Agopian [Thu, 27 Sep 2012 01:50:13 +0000 (18:50 -0700)]
am
1e83690c: Merge "assert -eng builds when calling a GL function without a context" into jb-mr1-dev
* commit '
1e83690c6030b33c7776fa65cb57132d5e2d0b40':
assert -eng builds when calling a GL function without a context
Mathias Agopian [Thu, 27 Sep 2012 01:48:54 +0000 (18:48 -0700)]
Merge "assert -eng builds when calling a GL function without a context" into jb-mr1-dev
Mathias Agopian [Thu, 27 Sep 2012 00:19:48 +0000 (17:19 -0700)]
assert -eng builds when calling a GL function without a context
Bug:
7241626
Change-Id: I0f1f9361e75e9186af8cff8d98a7d2224b266765
Andy McFadden [Thu, 27 Sep 2012 00:31:22 +0000 (17:31 -0700)]
am
9030333a: am
e206549c: Merge "Recompute visible regions more vigorously" into jb-mr1-dev
* commit '
9030333a4ec170baf90a7c62cc7c19970f12a5f5':
Recompute visible regions more vigorously
Andy McFadden [Thu, 27 Sep 2012 00:28:51 +0000 (17:28 -0700)]
am
e206549c: Merge "Recompute visible regions more vigorously" into jb-mr1-dev
* commit '
e206549ccf23ec5ba95062f944674e58569c8065':
Recompute visible regions more vigorously
Andy McFadden [Thu, 27 Sep 2012 00:27:42 +0000 (17:27 -0700)]
Merge "Recompute visible regions more vigorously" into jb-mr1-dev
Andy McFadden [Wed, 26 Sep 2012 23:19:12 +0000 (16:19 -0700)]
Recompute visible regions more vigorously
Some of the code in latchBuffer was calling invalidateHwcGeometry,
but that didn't cause the SurfaceFlinger visible region code to
re-evaluate the layer's visibility. Set the recomputeVisibleRegions
"out" parameter instead.
Bug
7235797
Change-Id: If6ba33fbd1a594cd64cc5253aebf752d6ceda1c9
Jesse Hall [Wed, 26 Sep 2012 21:49:49 +0000 (14:49 -0700)]
am
975424a7: am
a8026d21: Stop using transparent region for computing visible regions
* commit '
975424a767912a2291113d6ae774873eaf3ebf55':
Stop using transparent region for computing visible regions
Jesse Hall [Wed, 26 Sep 2012 21:48:22 +0000 (14:48 -0700)]
am
a8026d21: Stop using transparent region for computing visible regions
* commit '
a8026d21f3f2f09e3416cbd33c277fbd15d8cf4e':
Stop using transparent region for computing visible regions
Jesse Hall [Tue, 25 Sep 2012 20:25:04 +0000 (13:25 -0700)]
Stop using transparent region for computing visible regions
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, whiel still allowing the
transparent region hint to save power in the important
fullscreen-video-in-a-SurfaceView case.
Bug:
7179570
Change-Id: I47cf939e12129b167afa344b8b036e8827103ac8
The Android Open Source Project [Wed, 26 Sep 2012 17:07:53 +0000 (10:07 -0700)]
am
4152d3f4: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
4152d3f4c8332bbac3284283656b49661ad21b04':
only abort when errors happen on the main display
The Android Open Source Project [Wed, 26 Sep 2012 16:07:02 +0000 (09:07 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I2b5dfee2bfbe21b2d7f5a313c5c5e89bcb5379c1
The Android Automerger [Wed, 26 Sep 2012 13:59:39 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Mathias Agopian [Wed, 26 Sep 2012 06:00:08 +0000 (23:00 -0700)]
am
abee8d40: am
c4a8daaa: Merge "add support for EGL_FRAMEBUFFER_TARGET_ANDROID" into jb-mr1-dev
* commit '
abee8d40c430eb8137240f2635db32148a05f3fc':
add support for EGL_FRAMEBUFFER_TARGET_ANDROID
Mathias Agopian [Wed, 26 Sep 2012 05:58:43 +0000 (22:58 -0700)]
am
c4a8daaa: Merge "add support for EGL_FRAMEBUFFER_TARGET_ANDROID" into jb-mr1-dev
* commit '
c4a8daaa998ea524c9aaa9817021ff7c4467c3dd':
add support for EGL_FRAMEBUFFER_TARGET_ANDROID
Mathias Agopian [Wed, 26 Sep 2012 05:56:29 +0000 (22:56 -0700)]
Merge "add support for EGL_FRAMEBUFFER_TARGET_ANDROID" into jb-mr1-dev
Mathias Agopian [Wed, 26 Sep 2012 02:16:28 +0000 (19:16 -0700)]
only abort when errors happen on the main display
Bug:
7232690
Change-Id: I2c4b35a82f131da26deea738ef294e100e536d15
Mathias Agopian [Wed, 26 Sep 2012 02:24:03 +0000 (19:24 -0700)]
am
b06fbffb: am
32341381: only abort when errors happen on the main display
* commit '
b06fbffbded32050e91e1c65b452856a1a264d22':
only abort when errors happen on the main display
Mathias Agopian [Wed, 26 Sep 2012 02:22:01 +0000 (19:22 -0700)]
am
32341381: only abort when errors happen on the main display
* commit '
32341381c9493d7953e40f7f79653cfc52868863':
only abort when errors happen on the main display
Mathias Agopian [Wed, 26 Sep 2012 02:16:28 +0000 (19:16 -0700)]
only abort when errors happen on the main display
Bug:
7232690
Change-Id: I2c4b35a82f131da26deea738ef294e100e536d15
Mathias Agopian [Wed, 26 Sep 2012 01:24:31 +0000 (18:24 -0700)]
add support for EGL_FRAMEBUFFER_TARGET_ANDROID
we now try first with EGL_FRAMEBUFFER_TARGET_ANDROID, and
pick the first config we find. Otherwise, we revert to
the old algorithm.
Bug:
7232584
Change-Id: I8d5c5a4ce48420832c2e2828718a8f53325effb0
Mathias Agopian [Tue, 25 Sep 2012 22:57:27 +0000 (15:57 -0700)]
am
57fcc92e: am
7b190511: fix a crasher when running out of memory
* commit '
57fcc92e2cb1d86bfba5d0444cbf58195059b168':
fix a crasher when running out of memory
Mathias Agopian [Tue, 25 Sep 2012 22:55:24 +0000 (15:55 -0700)]
am
7b190511: fix a crasher when running out of memory
* commit '
7b1905113712281c777b230648d3fbb69ae4f42c':
fix a crasher when running out of memory
Mathias Agopian [Tue, 25 Sep 2012 22:34:15 +0000 (15:34 -0700)]
am
40e627c5: am
bb53b0e4: When "show visible regions" is enabled we were missing a call to HWC
* commit '
40e627c5b0952b8b342b9589d162b60319e1bbce':
When "show visible regions" is enabled we were missing a call to HWC
Andy McFadden [Tue, 25 Sep 2012 22:33:47 +0000 (15:33 -0700)]
am
e43bc405: am
f68c825c: Merge "Show build config in dumpsys SurfaceFlinger" into jb-mr1-dev
* commit '
e43bc405b7dc7d36293bd87321fc061a2631f544':
Show build config in dumpsys SurfaceFlinger
Mathias Agopian [Tue, 25 Sep 2012 22:28:44 +0000 (15:28 -0700)]
fix a crasher when running out of memory
MemoryHeapBase::getBase() returns MAP_FAILED in case or
OOM, not null which is what SF was checking against.
This addresses one of the issues of bug
7230543.
Bug:
7230543
Change-Id: I763a88f64a2f9ff75eb139cfbaf9a1a9746c5577
Mathias Agopian [Tue, 25 Sep 2012 21:42:07 +0000 (14:42 -0700)]
am
bb53b0e4: When "show visible regions" is enabled we were missing a call to HWC
* commit '
bb53b0e4b97634bc31808965f81b3ab4193d0e84':
When "show visible regions" is enabled we were missing a call to HWC
Mathias Agopian [Tue, 25 Sep 2012 04:27:29 +0000 (21:27 -0700)]
When "show visible regions" is enabled we were missing a call to HWC
Bug:
7204034
Change-Id: I64dd78362fa75149513a7d9ff92dde175e9b4958
Andy McFadden [Tue, 25 Sep 2012 20:49:47 +0000 (13:49 -0700)]
am
f68c825c: Merge "Show build config in dumpsys SurfaceFlinger" into jb-mr1-dev
* commit '
f68c825c75198e7b3296532db9352631f18983b7':
Show build config in dumpsys SurfaceFlinger