Merge commit 'dfdf9453577de9e22df3ecf9bbe3a48c2e59ccf1' into eclair-mr2-plus-aosp
* commit 'dfdf9453577de9e22df3ecf9bbe3a48c2e59ccf1':
When freeing an OMX node, attempt to transition it from its current state all the way to "Loaded" in order to properly free any allocated buffers.
* changes:
When freeing an OMX node, attempt to transition it from its current state all the way to "Loaded" in order to properly free any allocated buffers.
Merge commit 'd263a064f7a77768c3e70a98f286960b67dc1aa5' into eclair-mr2-plus-aosp
* commit 'd263a064f7a77768c3e70a98f286960b67dc1aa5':
Add a test for vCard composer.
Merge commit '57e824f7c33caf1e8c9cb08795464df4b8dbb218' into eclair-mr2-plus-aosp
* commit '57e824f7c33caf1e8c9cb08795464df4b8dbb218':
don't turn off filtering/dithering when we scroll.
Merge commit '0f2a4e6026a37fc8b321494f688e9f0e5a5bf744' into eclair-mr2-plus-aosp
* commit '0f2a4e6026a37fc8b321494f688e9f0e5a5bf744':
Add comment warning to not use hardware based autobrightness support.
Merge commit '9baeff05a8bf9bd4479f2a357dca0463cc750202' into eclair-mr2-plus-aosp
* commit '9baeff05a8bf9bd4479f2a357dca0463cc750202':
PowerManagerService: Do not enable light sensor if hardware backlight management is being used.
Merge commit '6897e36b894b2a10fd8b2e3af6587b5f789fde72' into eclair-mr2
* commit '6897e36b894b2a10fd8b2e3af6587b5f789fde72':
Add comment warning to not use hardware based autobrightness support.
Merge commit '6eb14c30387d9c13538887e54bc180a430b2ac40' into eclair-mr2
* commit '6eb14c30387d9c13538887e54bc180a430b2ac40':
PowerManagerService: Do not enable light sensor if hardware backlight management is being used.
This is deprecated and will be removed in the next release.
Change-Id: I23c5e711fd8e6768da2f5190d1b6c9fa77de41a6
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '7ed70c9515fe3df6eb1796717d73f23e7286b3e6' into eclair-mr2-plus-aosp
* commit '7ed70c9515fe3df6eb1796717d73f23e7286b3e6':
Fix issue 2192181: AudioFlinger must provide separated methods to set VOICE_CALL stream volume and down link audio volume.
Merge commit 'bf96aaadd46fb5b0884070177faa16ec4f22e2ba' into eclair-mr2
* commit 'bf96aaadd46fb5b0884070177faa16ec4f22e2ba':
Fix issue 2192181: AudioFlinger must provide separated methods to set VOICE_CALL stream volume and down link audio volume.
Merge commit 'adddd24f31291f733cd5f72898b92f13f37ae37c' into eclair-mr2-plus-aosp
* commit 'adddd24f31291f733cd5f72898b92f13f37ae37c':
Patching in hidden API to allow app managed preview frame buffers.
Merge commit '78a50aa1db6572ba7d9f9d91c6eb16f993c09f40' into eclair-mr2
* commit '78a50aa1db6572ba7d9f9d91c6eb16f993c09f40':
Patching in hidden API to allow app managed preview frame buffers.
Merge commit 'a2ec1f4cea5531fb824b3fb2802ef4573a4916d9' into eclair-mr2-plus-aosp
* commit 'a2ec1f4cea5531fb824b3fb2802ef4573a4916d9':
Add size checks for glBufferData and glBufferSubData
Merge commit '8f89a1a360465e08e81ceca3cb3042606a98668b' into eclair-mr2
* commit '8f89a1a360465e08e81ceca3cb3042606a98668b':
Add size checks for glBufferData and glBufferSubData
Merge commit 'b81199b3eed6f6079e5dc7bedeaa50712f3d9b11' into eclair-mr2-plus-aosp
* commit 'b81199b3eed6f6079e5dc7bedeaa50712f3d9b11':
make the password-clearing algorithm smarter
Instead of using glTex{Sub}Image2D() to refresh the textures, we're using an EGLImageKHR object
backed up by a gralloc buffer. The data is updated using memcpy(). This is faster than
glTex{Sub}Image2D() because the texture is not swizzled. It also uses less memory because
EGLImageKHW is not limited to power-of-two dimensions.
Merge commit 'baf4ca1bba6a93e20614d605a1232b3f34057723' into eclair-mr2-plus-aosp
* commit 'baf4ca1bba6a93e20614d605a1232b3f34057723':
Add a method to clear info about a contact
Merge commit '246978b8dc89562dda47fea9a7aee61949101242' into eclair-mr2
* commit '246978b8dc89562dda47fea9a7aee61949101242':
Add a method to clear info about a contact
Add a method so the ContactInfoWidget will throw away the cached
info it has on a contact (e.g. picture and uri).
Change-Id: Ia8f376e356c6bcf246bbd72239c5ca2a3b7c9574
Merge commit 'd9f3d60df9317f15a7f26bc050f51b53b46898ff' into eclair-mr2-plus-aosp
* commit 'd9f3d60df9317f15a7f26bc050f51b53b46898ff':
New API to instantiate a MediaExtractor given a URI and optional MIME type.
Merge commit '45db67f2e89341412613ea6b162dd0ad36f091c6' into eclair-mr2-plus-aosp
* commit '45db67f2e89341412613ea6b162dd0ad36f091c6':
bug #2180646: make comparing "404-04" and "40404" return true in PhoneNumberUtils.compare().
The driver can now report to us that they are hosed and we'll shut
down wifi and restart it - only to be used as a last resort.
Also fixing synch problem with updateWifiState.
bug: 2173119
Also DataSources now must provide a method initCheck()
and DataSource::reat_at has been renamed to readAt to conform to
standard API naming guidelines.
Merge commit '9069aa31accee9c23a4cf228ca27fe8fa8506a56' into eclair-mr2-plus-aosp
* commit '9069aa31accee9c23a4cf228ca27fe8fa8506a56':
Moving the individual extractor headers files to the private include directory.
Merge commit 'f0990646d505ec06d400debe5fd5c895fcb02f13' into eclair-mr2-plus-aosp
* commit 'f0990646d505ec06d400debe5fd5c895fcb02f13':
Show the soft keyboard when pressing center key/trackball on input field
Merge commit 'ad28543022101d0b01845e3f53dcd57e524816ef' into eclair-mr2-plus-aosp
* commit 'ad28543022101d0b01845e3f53dcd57e524816ef':
Make stagefright a little less verbose. Fix heap corruption for real.
Fixes http://b/issue?id=2210234
Consolidate center key/trackball presses on input fields, and show
soft keyboard if the field is not readonly. Also rename the method
for a center press, and pass a click rather than a touch. Requires
a change in external/webkit.
