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 '8f89a1a360465e08e81ceca3cb3042606a98668b' into eclair-plus-aosp
* 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 '40c995a704141c4b245ba422f26dc4046ed3538b'
* commit '40c995a704141c4b245ba422f26dc4046ed3538b':
Add a method to clear info about a contact
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
Merge commit '246978b8dc89562dda47fea9a7aee61949101242' into eclair-plus-aosp
* 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 'c91e3d8d897f7299269e177c2891fde31cfc6ae1'
* commit 'c91e3d8d897f7299269e177c2891fde31cfc6ae1':
New API to instantiate a MediaExtractor given a URI and optional MIME type.
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 'b17c86966b29f3b2604bc256c3ee056576133a03' into eclair-mr2
* commit 'b17c86966b29f3b2604bc256c3ee056576133a03':
When phone is ringing, power button should only mute the ringer, not hang up.
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
Merge commit 'd919aa74927fcabd18a9ea14a57f44240aecc7af'
* commit 'd919aa74927fcabd18a9ea14a57f44240aecc7af':
Moving the individual extractor headers files to the private include directory.
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 '79b609722ef2121368b2f40a0e67ac9fecc23b7c'
* commit '79b609722ef2121368b2f40a0e67ac9fecc23b7c':
Show the soft keyboard when pressing center key/trackball on input field
Merge commit 'f57b07dfa82aba5397e54d741ce6de0d1dcd73c9'
* commit 'f57b07dfa82aba5397e54d741ce6de0d1dcd73c9':
Make stagefright a little less verbose. Fix heap corruption for real.
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.
Merge commit '1f04c83684cb1a0f1e5cc6100294d6c3bbb65d4c'
* commit '1f04c83684cb1a0f1e5cc6100294d6c3bbb65d4c':
Still don't know why the heap gets corrupted, but not deleting the OMXNodeInstance appears to prevent this from happening.
Merge commit 'bae0d0d4c770bbd21a0b2763fa0ddb7cf6613476'
* commit 'bae0d0d4c770bbd21a0b2763fa0ddb7cf6613476':
Fix 2209967 Tonegenerator: mutex not release in startTone() upon timeout waiting for the stop sequence to complete.
Merge commit '6e6dbc3f4dadb844b472529f51e356fd1bdc1aaa'
* commit '6e6dbc3f4dadb844b472529f51e356fd1bdc1aaa':
Do not hide the cursor ring when clicking on an input field.
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.
Merge commit '1f64ffe2e486b5a0d0c77487bdb612ee46ed7ead' into eclair-mr2-plus-aosp
* commit '1f64ffe2e486b5a0d0c77487bdb612ee46ed7ead':
Still don't know why the heap gets corrupted, but not deleting the OMXNodeInstance appears to prevent this from happening.
Merge commit '470687e251ecb298bda17f3e3978ffeaf05622a9' into eclair-mr2-plus-aosp
* commit '470687e251ecb298bda17f3e3978ffeaf05622a9':
Fix 2209967 Tonegenerator: mutex not release in startTone() upon timeout waiting for the stop sequence to complete.
