Christopher Tate
203e95eef8
Merge "Add iteration-limited mode to FrameworkPerf" into ics-mr1
2011-11-28 17:56:18 -08:00
Xia Wang
efba5b5674
am 2d9f4620: Fix build
...
* commit '2d9f4620625405b916aa27177a6b5f82f8e5b15d':
Fix build
2011-11-28 16:53:50 -08:00
Dianne Hackborn
7aa0d8fb3d
Merge "Fix issue #5588689 : Black camera preview after coming back from gmail" into ics-mr1
2011-11-28 16:53:00 -08:00
Romain Guy
30d5c55ee7
Merge "Fix crash in existing applications Bug #5659476 " into ics-mr1
2011-11-28 16:06:52 -08:00
Xia Wang
5c71c805c5
am 25261f59: Merge "Increase time between wifi stop and wifi start: set to 2 minutes http://b/issue?id=5629901 " into ics-mr0
...
* commit '25261f59af0d902f239e541b735f7dc31e714b07':
Increase time between wifi stop and wifi start: set to 2 minutes http://b/issue?id=5629901
2011-11-28 16:02:44 -08:00
Xia Wang
0969e94791
Merge "Increase time between wifi stop and wifi start: set to 2 minutes http://b/issue?id=5629901 " into ics-mr0
2011-11-28 16:00:49 -08:00
Chet Haase
a44370e22b
Merge "Fix flashing wifi dialog after rotating back from landscape." into ics-mr1
2011-11-28 15:43:23 -08:00
Eric Rowe
1d6410bcaf
Merge "Fix SCO start stop tests." into ics-mr1
2011-11-28 12:32:34 -08:00
Narayan Kamath
50db512db6
Merge "Fix TTS instantiation from webview accessibility handlers." into ics-mr1
2011-11-28 10:36:32 -08:00
Derek Sollenberger
7dea1f9e3e
Merge "Update Webkit with the zoom level after double tap gesture" into ics-mr1
2011-11-28 10:34:04 -08:00
Narayan Kamath
8c65dea758
Merge "Fix regressions in TTS completion callbacks." into ics-mr1
2011-11-24 09:38:15 -08:00
Irfan Sheriff
1f13f84cea
Merge "Fix tethering interaction from wifi" into ics-mr1
2011-11-23 19:18:22 -08:00
John Wang
0f20328ac0
Merge "Fix a build break." into ics-mr1
2011-11-23 16:48:32 -08:00
Mathias Agopian
b8bb31dc10
temporarily hardcode Nexus S refresh rate
...
Change-Id: Id8465f679b96636041b4b891d0b358c387d456c3
2011-11-23 14:51:09 -08:00
Eric Laurent
ae170f664c
Merge "audioflinger: reduce sleep time to avoid underrun" into ics-mr1
2011-11-23 12:31:04 -08:00
Michael Chan
029d707b4b
Merge "Update description of account_type" into ics-mr1
2011-11-23 12:12:51 -08:00
Robert Greenwalt
252b763217
Merge "Fix some policy-base routing issues." into ics-mr1
2011-11-23 11:25:39 -08:00
Owen Lin
0f644e5257
Merge "Fix 5654631. It forgot to consider the year in formatDateRange." into ics-mr1
2011-11-22 17:44:52 -08:00
The Android Open Source Project
0922394b74
Reconcile with ics-mr0-release
...
Change-Id: Ib84a053208dd4deae9bfe04e185ab2cec4728864
2011-11-22 15:24:04 -08:00
The Android Open Source Project
46dbb9b634
Reconcile with ics-mr0-release
...
Change-Id: I0b5b295a6fc0e4e7978ce11905c3cffd0e07f7e1
2011-11-22 15:14:10 -08:00
The Android Automerger
5ac81863de
merge in ics-mr0-release history after reset to ics-mr0
2011-11-22 14:28:06 -08:00
dujin.cha
94b093c607
am fe464a76: [Prime K] Fix gabage character issue
...
* commit 'fe464a76d8fc858be971dbb5e67b1d22fd925347':
[Prime K] Fix gabage character issue
2011-11-22 13:18:27 -08:00
Jean-Baptiste Queru
502a9c95c8
Ignore e36657e5
...
Change-Id: I93632b881f8c5231a521863cb4a8f05d81ea8ada
2011-11-22 13:15:31 -08:00
Romain Guy
a67d4d23e5
Merge "Draw in the correct FBO after invoking a GL functor Bug #5650514 " into ics-mr1
2011-11-22 12:33:17 -08:00
Romain Guy
b1c3730a26
Merge "Ensure we have an EGL context when building layers Bug #5638421 " into ics-mr1
2011-11-22 12:33:04 -08:00
Amith Yamasani
6ff0e8a106
Merge "Fix an NPE on overflow in BatteryStats history." into ics-mr1
2011-11-22 11:02:49 -08:00
Teng-Hui Zhu
05e688ad9d
Merge "HTML5 Video runs into super full screen mode" into ics-mr1
2011-11-22 08:54:59 -08:00
Andreas Huber
2389af0dc6
Merge "Report a runtime error instead of asserting on malformed avc configuration data." into ics-mr1
2011-11-22 08:39:11 -08:00
Daniel Sandler
9f96a44b20
Merge "Dismiss system windows when screen savers start." into ics-mr1
2011-11-22 07:15:29 -08:00
Mangesh Ghiware
2b7f7eb1fa
Merge "Update zoom (aka display) density from WebView thread." into ics-mr1
2011-11-21 23:14:05 -08:00
Romain Guy
14986f7cb5
Merge "Hide ManagedEGLContext until we are sure this is the correct API." into ics-mr1
2011-11-21 21:18:51 -08:00
James Dong
ef94a3fb02
Merge "Fix log spamming during time lapse video recording" into ics-mr1
2011-11-21 20:28:27 -08:00
Wu-cheng Li
92bc62e00b
Merge "Move Camera.Sound to a stand-alone class CameraSound." into ics-mr1
2011-11-21 18:10:52 -08:00
Mathias Agopian
7723773df3
Merge "don't report an error when disconnecting from an abandoned surfacetexture" into ics-mr1
2011-11-21 17:57:31 -08:00
Mathias Agopian
75cf5a7480
Merge "enable ALLOW_DEQUEUE_CURRENT_BUFFER for tegra devices" into ics-mr1
2011-11-21 17:57:20 -08:00
Romain Guy
7e7fa2543d
Merge "Notify views when EGL resources are about to be destroyed Bug #5639899 " into ics-mr1
2011-11-21 17:57:05 -08:00
Jamie Gennis
b7d87c40ef
SurfaceMediaSource: use the vid enc usage bit
...
This change makes SurfaceMediaSource add the VIDEO_ENC usage bit when
allocating its GraphicBuffers rather than the HW_TEXTURE bit.
Change-Id: Ie20e225c894fdbc31cad6bb82b3b64c7e98074eb
2011-11-21 17:48:19 -08:00
Adam Powell
a9273339c2
Merge "Fix bug 5521467 - Monkeys and ActionBar custom tab views" into ics-mr1
2011-11-21 17:34:57 -08:00
Nick Pelly
33733ed06b
Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1
2011-11-21 16:03:40 -08:00
Jamie Gennis
e011aa2b0f
Merge "EGL: Use cache sizes defined in the BoardConfig" into ics-mr1
2011-11-21 15:54:54 -08:00
Jamie Gennis
b440acd1c8
Merge changes I37fd43b5,I91eb29db,I0491ce35 into ics-mr1
...
* changes:
SurfaceTexture: fix a couple tests
EGL: default to swap interval 1
SurfaceTexture: clean up some tests
2011-11-21 15:54:40 -08:00
Eric Fischer
c4411803fb
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
2011-11-21 15:29:06 -08:00
Chia-chi Yeh
7ea0388c04
Merge "SIP: turn off verbose logs." into ics-mr1
2011-11-21 15:19:35 -08:00
Jamie Gennis
e3603d7d09
SurfaceTexture: fix a couple tests
...
This change fixes some robustness issues with the
EglDestroySurfaceUnrefsBuffers and
EglDestroySurfaceAfterAbandonUnrefsBuffers tests. The tests previously
depended upon GL implementation details that should not have been relied
upon.
Change-Id: I37fd43b56568efe1dbe69d85e892be8a1cf44d20
2011-11-21 14:38:15 -08:00
Jamie Gennis
59769469e4
EGL: default to swap interval 1
...
This change explicitly sets swap interval 1 on the window when an
EGLSurface is created to render to it.
Change-Id: I91eb29dbee3ae4a55076b921f084d503fbe94e03
2011-11-21 14:37:29 -08:00
Jamie Gennis
6f4cdfe0db
SurfaceTexture: clean up some tests
...
This change cleans a few things up in the SurfaceTexture tests:
- Wraps a few long lines.
- Refactors the multithreading portions of SurfaceTextureGLToGLTest into
a new test fixture called SurfaceTextureGLThreadToGLTest.
- Changes some of the tests that were creating their own EGLSurface to
use the SurfaceTextureGLToGLTest fixture.
- Reorders the test functions so that they are immediately below to the
test fixture that they use.
Change-Id: I0491ce3528a7ff2b4f1e83602ba290269c087297
2011-11-21 11:52:02 -08:00
Jamie Gennis
89c1d61c16
EGL: Use cache sizes defined in the BoardConfig
...
This change introduces two new BoardConfig variables to control the size
limits of the EGL blob cache. MAX_EGL_CACHE_ENTRY_SIZE is the size
limit for values inserted into the cache, and MAX_EGL_CACHE_SIZE is the
size limit for all entries in the entire cache (including both keys and
values). If either of these BoardConfig variables are not defined then
a default size limit is used instead.
Change-Id: I6703d93f966b6389c6499f23d841e42339f9c9d7
2011-11-21 11:48:17 -08:00
Kristian Monsen
2f399ff6ef
Merge "Improving PictureListener deprecating comments" into ics-mr1
2011-11-20 07:26:59 -08:00
Daniel Sandler
faed2acf61
Merge "Dreams (now Screen Candy) development." into ics-mr1
2011-11-19 20:42:19 -08:00
The Android Automerger
ce5c0d456a
merge in ics-mr0-release history after reset to ics-mr0
2011-11-18 22:01:43 -08:00
