Merge commit 'ec61707d39c14950f53795b0610ea1ee00daecdb'
* commit 'ec61707d39c14950f53795b0610ea1ee00daecdb':
fix an NPE on a race condition that occurs when unbinding from an authenticator at the samer time that its process dies: bug 2171204
Merge commit '145928617af865e867f6f27e99173d2a756b9dfd' into eclair-mr2-plus-aosp
* commit '145928617af865e867f6f27e99173d2a756b9dfd':
Enabling plugin surfaces to update their position in the UI.
Since the caller expects the data to fit within a certain amount of
space, do not copy into the buffer if the data exceeds that space.
Requires a change to external/webkit
Merge commit '7d4acc5316c080d8e9787d2a7c84e2a2500b85f8' into eclair-mr2-plus-aosp
* commit '7d4acc5316c080d8e9787d2a7c84e2a2500b85f8':
Throttle camera preview frames to the app. Bug 2180302.
Merge commit '69e2ef473cd47404ee711bf2464cbfc7c8c83e42' into eclair-mr2
* commit '69e2ef473cd47404ee711bf2464cbfc7c8c83e42':
Throttle camera preview frames to the app. Bug 2180302.
With higher frame rates and larger preview frames, we can easily
flood the application with too much data. This patch fakes the
old camera preview mode by doing continuous one-shot frames.
After the previous frame is handled, if the application hasn't
cleared the preview callback, we start another one-shot preview
frame. With this change, the application should never have more
than one preview frame unless it is explicitly saving references
to them.
modified: core/java/android/hardware/Camera.java
Merge commit 'd5ad08bd4230c2f5d58969c624c39a3f5a2019d1' into eclair-mr2-plus-aosp
* commit 'd5ad08bd4230c2f5d58969c624c39a3f5a2019d1':
Continue caching "POST" result so that we won't get
Merge commit '2e778c176d17c295f475141bddda9dca5cd65fce' into eclair-mr2
* commit '2e778c176d17c295f475141bddda9dca5cd65fce':
Continue caching "POST" result so that we won't get
Merge commit '7c6770c26ba819bcad3d9522e046f9d1fdf9e222' into eclair-mr2-plus-aosp
* commit '7c6770c26ba819bcad3d9522e046f9d1fdf9e222':
Add the flag "FLAG_APPEND_TYPE_PARAM" to VCardConfig, which
Merge commit '347daf3a9802b2a4184ff8aa90b4af6c5de79ab7' into eclair-mr2-plus-aosp
* commit '347daf3a9802b2a4184ff8aa90b4af6c5de79ab7':
Implement unit tests for vCard exporter, which depends on the sucess in vCard importer.
In order to share the logic between tests for importer and those for exporter,
PropertyNodesVerifier is now a separated class and drastically modified.
Now the class accept "unordered" expected PropertyNode objects, which allows vCard
composer to not care the exact order of each elements.
MockCursor is added, which may be added into the public API in the future, but in
the test directory for now.
Another MockContentProvider is (temporarily) developed so that it can be accepted by
MockContentResolver#addProvider(), which does not allow IContentProvider and its
descendants but only exact ContentProvider, while the original MockContentProvider in
android.test.mock.MockContentProvider implements IContentProvider.
The test development is still on-going, but this test suffices minimal requirement of
vCard tests.
Internal issue number: 2160039
Merge commit 'ff9c48b3040833c7b3f85bcac116ba5f0dd247d0'
* commit 'ff9c48b3040833c7b3f85bcac116ba5f0dd247d0':
Improve drawing cache speed by selecting the correct opacity and keeping a 32 bits
Merge commit 'bd5662a1a2e74f1be1e0a0fb4858835caf10c315' into eclair-mr2-plus-aosp
* commit 'bd5662a1a2e74f1be1e0a0fb4858835caf10c315':
add local flag to enable FPS w/o having to enable Config.DEBUG, which can have unintended costs
Merge commit '2f2634e5be65c56f93d3fc3a97e25c546e3bc8bc'
* commit '2f2634e5be65c56f93d3fc3a97e25c546e3bc8bc':
Add group id to getThumbnail and cancelThumbnailRequest API.
Merge commit '2a9b411d4ed60acbe089068c93850ecd049f57f2'
* commit '2a9b411d4ed60acbe089068c93850ecd049f57f2':
Turn some logging back on in ConnectionManager
Merge commit '5a535026bfc1d091c0d029b21cc63f929c2def0a'
* commit '5a535026bfc1d091c0d029b21cc63f929c2def0a':
Make sdk version and code names static finals in PackageParser.
Merge commit '4613007b5755ed95a3a649909b4702400863f9b4'
* commit '4613007b5755ed95a3a649909b4702400863f9b4':
Make VCardComposer create the instance for mHandlerList.
Merge commit 'a1cb6a64c6710d46cc8673bc17db3bdb5c7bbc09'
* commit 'a1cb6a64c6710d46cc8673bc17db3bdb5c7bbc09':
Provide an API for apps to use a dynamic RFCOMM channel and SDP record.
Merge commit '4bc6158d6bdeff796cfd61d489c01db0d203534c'
* commit '4bc6158d6bdeff796cfd61d489c01db0d203534c':
Fix issue #2166755: BroadcastReceiver trying to return result during a non-ordered broadcast
Merge commit 'e1bf39bc764c78344dd2a6c59c5709919bdc1da9'
* commit 'e1bf39bc764c78344dd2a6c59c5709919bdc1da9':
Make sure AsyncTask sens a null result to onPostExecute() when cancelled.
Merge commit '36cad7be504608a538c845b4a44f0dcee157a338'
* commit '36cad7be504608a538c845b4a44f0dcee157a338':
Add cancel() VCardDataBuilder, which is intended to remove
Merge commit 'a4323999ecfaef42c70eec39b6a8f0bfcfaf2394'
* commit 'a4323999ecfaef42c70eec39b6a8f0bfcfaf2394':
Don't reinflate search bar when dialog is already showing
Merge commit '11782b905292ebde1b591f6561913affdfd415fc'
* commit '11782b905292ebde1b591f6561913affdfd415fc':
Extend the date time to handle the case where the
