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.
* 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 '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
- 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 '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.
* changes:
Implement data push from scripts. Fixes the problem where apps would have to poll to monitor a scripts state. Fix bug in StoreState where state could be overridden by the default unless the script used more than one state.
Fix bug in StoreState where state could be overridden by the default unless the script used more than one state.
Change only impacts renderscript and renderscript apps.
Merge commit '5bba632d877c2878384ff21566c8eb6a1a22f37b' into eclair-mr2
* commit '5bba632d877c2878384ff21566c8eb6a1a22f37b':
- hide Entity and all its references
- remove updateEntity and insertEntity, since they are not
used
- add the RawContacts.Entity class, which is used in lieu of the
android.content.Entity
Merge commit '5163cd6d1cb664977eb4473b98657c7e92ae430e' into eclair-mr2
* commit '5163cd6d1cb664977eb4473b98657c7e92ae430e':
Make sdk version and code names static finals in PackageParser.
* changes:
Make sdk version and code names static finals in PackageParser. Remove api to set these values. Remove an unused method in AppSecurityPermissions
Merge commit 'ccc214b21edaaddf46960388ec4d3e3ca89a01ae' into eclair-mr2
* commit 'ccc214b21edaaddf46960388ec4d3e3ca89a01ae':
Make VCardComposer create the instance for mHandlerList.
Merge commit '9c3c276afa7e2485e1a9f47e29ada8cb61b7b07c' into eclair-mr2
* commit '9c3c276afa7e2485e1a9f47e29ada8cb61b7b07c':
New section header and divider assets.
Merge commit '841a8eea78479ad8a3c10e69a788adbeaef5a53d' into eclair-mr2
* commit '841a8eea78479ad8a3c10e69a788adbeaef5a53d':
Reimplement all the method of Paint for layoutlib
Merge commit 'c39d2e3c012fb96999991e30659a474f9f30f789' into eclair-mr2
* commit 'c39d2e3c012fb96999991e30659a474f9f30f789':
Music visualizer support hack.
