Commit Graph

47531 Commits

Author SHA1 Message Date
Dianne Hackborn
ec5f313aa8 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
2012-10-03 13:53:43 -07:00
Dianne Hackborn
35387922bd Merge "Fix issue #7271589: Cannot set Ocean HD live wallpaper" into jb-mr1-dev 2012-10-03 12:09:13 -07:00
Dianne Hackborn
7f3096ca88 Fix issue #7271589: Cannot set Ocean HD live wallpaper
Change-Id: Id7662c503815293040c240232a6622bd6f6eab37
2012-10-03 11:27:19 -07:00
The Android Open Source Project
6709164472 Reconcile with jb-mr1-release - do not merge
Change-Id: I0c361b5f1fde8ab48360efa3a06ab7d2ccb88370
2012-10-03 07:34:04 -07:00
The Android Automerger
5ff5d16d32 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-03 06:59:44 -07:00
Jesse Hall
ee5fb9299b 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
2012-10-02 16:35:17 -07:00
Jesse Hall
ba607d53c6 Add Fence::waitForever which logs a warning timeout, and use it
Bug: 7217641
Change-Id: If0c1a613ead307c4045a47824174bf40c72bc7d7
2012-10-02 16:29:46 -07:00
Kenny Root
7011d5a46b am ee42072b: am 52f1edb3: Merge "Update tests for new build target"
* commit 'ee42072bcccab880dd685736a32a56ac62ffc331':
  Update tests for new build target
2012-10-02 09:55:49 -07:00
Kenny Root
ee42072bcc am 52f1edb3: Merge "Update tests for new build target"
* commit '52f1edb3f11aae1af74a1bfc6f18f81b4d761358':
  Update tests for new build target
2012-10-02 09:54:22 -07:00
Kenny Root
52f1edb3f1 Merge "Update tests for new build target" 2012-10-02 09:46:29 -07:00
Kenny Root
ed22c1cfe5 Update tests for new build target
Change-Id: Ia1740d1b2c0b611c4559c5c846b12fb5c3e81b07
2012-10-02 09:42:49 -07:00
The Android Open Source Project
64a48d284c Reconcile with jb-mr1-release - do not merge
Change-Id: If7c87d1cb0dc5bb52bb5a6e4b7fa8563c8e30694
2012-10-02 09:18:33 -07:00
The Android Automerger
0b08131b60 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-02 06:59:40 -07:00
Mathias Agopian
8345fb00ed am 2ae7bec7: Revert "improve sensor fusion" -- DO NOT MERGE
* commit '2ae7bec77093744206080dbae020edfa3bfac2e1':
  Revert "improve sensor fusion" -- DO NOT MERGE
2012-10-01 23:35:57 -07:00
Mathias Agopian
2ae7bec770 Revert "improve sensor fusion" -- DO NOT MERGE
This reverts commit bdf277355d.
This reverts commit dc5b63e40e.

it might be responsible for a regression that makes the
rotation vector spin.

Bug: 7267330
Change-Id: Ifb10e933537e70c1d85a7ba73a7e3ae59002fe62
2012-10-01 20:31:05 -07:00
Jeff Sharkey
7006cdfc72 am 0c2a25c1: Merge "Include Global table in bugreports." into jb-mr1-dev
* commit '0c2a25c11c6688dbc682eabecbdfbc1587ada684':
  Include Global table in bugreports.
2012-10-01 13:11:47 -07:00
Jeff Sharkey
0c2a25c11c Merge "Include Global table in bugreports." into jb-mr1-dev 2012-10-01 13:08:22 -07:00
Jeff Sharkey
719b8aa1c5 Include Global table in bugreports.
Bug: 7257648
Change-Id: I84c7230fd115cf9d7269bc5367026b52cbcc86ac
2012-10-01 12:52:42 -07:00
Jamie Gennis
a6f895ee34 am d30b36d1: SurfaceFlinger: reset the FB_TGT acquire fence
* commit 'd30b36d1fd0c7ab80553e784a155266be9703e47':
  SurfaceFlinger: reset the FB_TGT acquire fence
2012-10-01 12:29:34 -07:00
Jamie Gennis
d30b36d1fd 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
2012-10-01 12:24:59 -07:00
Dianne Hackborn
9c63cdd6b0 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
2012-10-01 11:42:49 -07:00
Dianne Hackborn
ec0f5e5f0c Merge "Fix issue #7257947: Need to fix heap limits on Mako" into jb-mr1-dev 2012-10-01 11:38:19 -07:00
Mathias Agopian
f8e5c37bc5 am 135e5899: save/restore viewport properly when taking screenshot
* commit '135e5899f70a67e62baaf6dbec7ba2ce611ca16a':
  save/restore viewport properly when taking screenshot
2012-10-01 10:16:47 -07:00
The Android Automerger
988ae777fa merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-01 06:59:20 -07:00
Mathias Agopian
135e5899f7 save/restore viewport properly when taking screenshot
Bug: 7241739
Change-Id: Iba8b9ffc75ab47fbc56169e65da26d96850a9297
2012-09-30 16:43:20 -07:00
Dianne Hackborn
c84e9844d6 Fix issue #7257947: Need to fix heap limits on Mako
Change-Id: Id8014b19195b8740bccf000ab66c1b599ba3a1a0
2012-09-30 16:26:49 -07:00
The Android Automerger
ed9af489ed merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-30 06:59:40 -07:00
Mathias Agopian
f00c34babb am bae92d0d: reset GL viewport and project when caputring the screen
* commit 'bae92d0d605e99a14731add4f11b72413b2835e5':
  reset GL viewport and project when caputring the screen
2012-09-28 13:38:51 -07:00
Mathias Agopian
bae92d0d60 reset GL viewport and project when caputring the screen
Bug: 7241739
Change-Id: I3bb5214b070384de9be2026647865c6c236a4331
2012-09-28 13:34:26 -07:00
Andy McFadden
bcc1cd161f am c01a79d7: Pass display arg to blank/unblank
* commit 'c01a79d77b829e7de86ef137694e8ad708470ca1':
  Pass display arg to blank/unblank
2012-09-28 13:08:42 -07:00
Andy McFadden
c01a79d77b 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
2012-09-28 13:04:16 -07:00
Chet Haase
bba6bb8137 am 4c273277: Merge "Re-enable FAST_TLS in gl2 code" into jb-mr1-dev
* commit '4c2732779a11c92222958e7150162d4eaaab7b66':
  Re-enable FAST_TLS in gl2 code
2012-09-28 12:41:24 -07:00
Chet Haase
4c2732779a Merge "Re-enable FAST_TLS in gl2 code" into jb-mr1-dev 2012-09-28 12:38:29 -07:00
Andreas Huber
916ce16ed4 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.
2012-09-28 12:33:29 -07:00
Andreas Huber
589e2e74e4 Merge "Add a way to configure an OMX encoder to emit SPS/PPS before IDR frames." into jb-mr1-dev 2012-09-28 12:31:32 -07:00
Chet Haase
e8b0fac720 Re-enable FAST_TLS in gl2 code
Temporarily changed USE_FAST_TLS_KEY ifdef during debugging. Changing it
back now.

Change-Id: I7c2fcf7265b3d545e31ff7683bd7614100fad3e5
2012-09-28 11:56:48 -07:00
Andreas Huber
7682a9c35a Add a way to configure an OMX encoder to emit SPS/PPS before IDR frames.
Change-Id: I71ce254533c8e99bc54d199d8a9828397fe3d99d
related-to-bug: 7245308
2012-09-28 11:33:17 -07:00
Jamie Gennis
f676078613 am a4310c8b: SurfaceFlinger: don\'t always set HWC_GEOM_CHGD
* commit 'a4310c8be2dc3406a668ee99020d52187173232f':
  SurfaceFlinger: don't always set HWC_GEOM_CHGD
2012-09-28 11:14:48 -07:00
The Android Automerger
88b0605f2e merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-28 06:59:31 -07:00
Iliyan Malchev
51af710d3b Revert "Compatibility work around for bad graphics driver dependency."
This reverts commit a50b51c03a

Change-Id: Ibdcd776a7f241dbb2475403ea04f939249774c41
2012-09-27 17:58:20 -07:00
Jamie Gennis
a4310c8be2 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
2012-09-27 17:27:20 -07:00
Romain Guy
e1549fcb44 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
2012-09-27 16:05:31 -07:00
Romain Guy
cb094a783f Merge "New compile-time flags to make debugging easier for us poor souls Bug #7195815" into jb-mr1-dev 2012-09-27 16:04:04 -07:00
Iliyan Malchev
76d4bd3e42 am 38b65726: Revert "Compatibility work around for bad graphics driver dependency."
* commit '38b657265ccc5ae45bd7860a68b0d9373b47a2f3':
  Revert "Compatibility work around for bad graphics driver dependency."
2012-09-27 15:54:09 -07:00
Iliyan Malchev
38b657265c Revert "Compatibility work around for bad graphics driver dependency."
This reverts commit a50b51c03a

Change-Id: Ibdcd776a7f241dbb2475403ea04f939249774c41
2012-09-27 15:52:12 -07:00
Romain Guy
f12fe43e8c New compile-time flags to make debugging easier for us poor souls
Bug #7195815

Change-Id: I23e7ac991891b9586cb8ed20b1305c8b1b3e2b43
2012-09-27 15:47:10 -07:00
The Android Open Source Project
f76c31ce58 Reconcile with jb-mr1-release - do not merge
Change-Id: I4e21c53aec26d5503f1640cf06acbadcf9eedb59
2012-09-27 09:58:04 -07:00
The Android Automerger
6c729ef4b5 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-27 06:59:44 -07:00
Mathias Agopian
2ac4194854 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
2012-09-26 18:50:13 -07:00
Mathias Agopian
1e83690c60 Merge "assert -eng builds when calling a GL function without a context" into jb-mr1-dev 2012-09-26 18:48:54 -07:00