Merge commit '72da3a467e46453e87549492ccec47e1feda6fe2' into eclair-mr2-plus-aosp
* commit '72da3a467e46453e87549492ccec47e1feda6fe2':
Fix failing unit test; the test was using a deprecated API making it fail on WVGA devices.
Merge commit '160e97cb5de5c4e9877c1d47d23935a2066fa84e' into eclair-mr2-plus-aosp
* commit '160e97cb5de5c4e9877c1d47d23935a2066fa84e':
temporarily disable the use of glTexImage2D for sw buffers on sholes.
Merge commit '0ef55540ab75660c58b284415ebae7ea66684706' into eclair-mr2-plus-aosp
* commit '0ef55540ab75660c58b284415ebae7ea66684706':
fix [2168528] enable glTexImage2D code path in SF for software-only buffers
fix [2168531] have software-only gralloc buffer side-step the HAL
fix [2167050] glTexImage2D code path buggy in SurfaceFlinger
Merge commit '12bb2c4c6d73c5b9e531ba852fb6260bb8b87411' into eclair-mr2-plus-aosp
* commit '12bb2c4c6d73c5b9e531ba852fb6260bb8b87411':
Fix tls crash on startup if more than one RS contexts are created in one process.
Merge commit 'c404ed2be5d29c8932a3d69b53fea4653c9b868b' into eclair-mr2
* commit 'c404ed2be5d29c8932a3d69b53fea4653c9b868b':
Fix failing unit test; the test was using a deprecated API making it fail on WVGA devices.
Merge commit 'c131c5671965b69b0dee3e4afa3b3dd5e3c0c405' into eclair-mr2
* commit 'c131c5671965b69b0dee3e4afa3b3dd5e3c0c405':
temporarily disable the use of glTexImage2D for sw buffers on sholes.
Merge commit '9d6a685ba939f413a8d3e1e97627593aa1cdf6cb' into eclair-mr2
* commit '9d6a685ba939f413a8d3e1e97627593aa1cdf6cb':
fix [2168528] enable glTexImage2D code path in SF for software-only buffers
fix [2168531] have software-only gralloc buffer side-step the HAL
fix [2167050] glTexImage2D code path buggy in SurfaceFlinger
Merge commit 'fe7c2a50148ac9f0d6fbe0030fc53f457c10870a' into eclair-mr2
* commit 'fe7c2a50148ac9f0d6fbe0030fc53f457c10870a':
Fix tls crash on startup if more than one RS contexts are created in one process.
A window is created and the browser is about to render into it the
very first time, at that point it does an IPC to SF to request a new
buffer. Meanwhile, the window manager removes that window from the
list and the shared memory block it uses is marked as invalid.
However, at that point, another window is created and is given the
same index (that just go freed), but a different identity and resets
the "invalid" bit in the shared block. When we go back to the buffer
allocation code, we're stuck because the surface we're allocating for
is gone and we don't detect it's invalid because the invalid bit has
been reset.
It is not sufficient to check for the invalid bit, I should
also check that identities match.
This change is a complement to the main fix in kernel driver for the same issue (partner change #1250).
It removes clicks sometimes heard after the end of the tones while audio flinger is sending 0s to the audio output stream.
The problem was that the sleep time between two writes was more than the duration of one audio output stream buffer which could cause some underrun.
Also fixed a recent regression in ToneGenerator that made that the end of previous tone was repeated at the beginning of current one under certain timing circumstances when the maximum tone duration was specified.
* changes:
fix [2168528] enable glTexImage2D code path in SF for software-only buffers
fix [2168531] have software-only gralloc buffer side-step the HAL
fix [2167050] glTexImage2D code path buggy in SurfaceFlinger
When EGLImage extension is not available, SurfaceFlinger will fallback to using
glTexImage2D and glTexSubImage2D instead, which requires 50% more memory and an
extra copy. However this code path has never been exercised and had some bugs
which this patch fix.
Mainly the scale factor wasn't computed right when falling back on glDrawElements.
We also fallback to this mode of operation if a buffer doesn't have the adequate
usage bits for EGLImage usage.
This changes only code that is currently not executed. Some refactoring was needed to
keep the change clean. This doesn't change anything functionaly.
Merge commit '1b7ad876f1274787d7609a31e4a2a852adb94c3c' into eclair-mr2-plus-aosp
* commit '1b7ad876f1274787d7609a31e4a2a852adb94c3c':
Fixed issue #4098: Ringtone#getTitle does not close its cursor.
Merge commit '13ed5750ba515c3b4345937c7a11667a90cb1265' into eclair-mr2-plus-aosp
* commit '13ed5750ba515c3b4345937c7a11667a90cb1265':
Add group id to getThumbnail and cancelThumbnailRequest API.
Merge commit '3e655688728e352e51dc9718490589f1bfb8622d' into eclair-mr2-plus-aosp
* commit '3e655688728e352e51dc9718490589f1bfb8622d':
Fix for bug 2158794. Hide MediaPlayer.invoke() and MediaPlayer.newRequest(), and Fix bad links in ToneGenerator documentation.
Merge commit 'c7bade2a910d3fd34275440d1cc8bb9c0c9a989a' into eclair-mr2-plus-aosp
* commit 'c7bade2a910d3fd34275440d1cc8bb9c0c9a989a':
Add a test to make sure the replaced classes in layoutlib are correct.
Merge commit 'e8830120c8e416a26520dfbbd0e386e77255dbda' into eclair-mr2-plus-aosp
* commit 'e8830120c8e416a26520dfbbd0e386e77255dbda':
Turn some logging back on in ConnectionManager
Merge commit '521f4f3af94e3a093a37af887d3e317a526b61a1' into eclair-mr2
* commit '521f4f3af94e3a093a37af887d3e317a526b61a1':
Fix for bug 2158794. Hide MediaPlayer.invoke() and MediaPlayer.newRequest(), and Fix bad links in ToneGenerator documentation.
Merge commit '0a9d46b7e741ccf7272bb69a4eef3c1f2adc91b7' into eclair-mr2
* commit '0a9d46b7e741ccf7272bb69a4eef3c1f2adc91b7':
Add a test to make sure the replaced classes in layoutlib are correct.
Merge commit '92b5caa4e21d48db6efeddba532d1546c6e686b1' into eclair-mr2
* commit '92b5caa4e21d48db6efeddba532d1546c6e686b1':
Turn some logging back on in ConnectionManager
Merge commit '9816a5d1ee1dfa733c740defbe71bf7bf5b9fc52' into eclair-mr2-plus-aosp
* commit '9816a5d1ee1dfa733c740defbe71bf7bf5b9fc52':
Implement data push from scripts. Fixes the problem where apps would have to poll to monitor a scripts state.
- Move test files to their own package for easy binary inclusion
in adt-test
- fix some tests and remove obsolete ones.
Change-Id: I5b967f29074fdad74073f9b37d903eabe8dc29e6
Merge commit '77a7bdce65977539654d60d5d7e286d7ae84dd4c' into eclair-mr2-plus-aosp
* commit '77a7bdce65977539654d60d5d7e286d7ae84dd4c':
- hide Entity and all its references
Merge commit 'ef3c63ad20c4c45c0ae1748a67b5f33d26415938' into eclair-mr2-plus-aosp
* commit 'ef3c63ad20c4c45c0ae1748a67b5f33d26415938':
Make sdk version and code names static finals in PackageParser.
Merge commit '968a9571a391a2dbb0512c4fb99d04ab50861753' into eclair-mr2
* commit '968a9571a391a2dbb0512c4fb99d04ab50861753':
Implement data push from scripts. Fixes the problem where apps would have to poll to monitor a scripts state.
