Merge commit '4fce5c81d5b166920c60d4a907e581c71c215858'
* commit '4fce5c81d5b166920c60d4a907e581c71c215858':
Add the flag "FLAG_APPEND_TYPE_PARAM" to VCardConfig, which
Merge commit '74a2d09cba89db3b404aa10d89b5139f5ff6ab5d'
* commit '74a2d09cba89db3b404aa10d89b5139f5ff6ab5d':
Implement unit tests for vCard exporter, which depends on the sucess in vCard importer.
Merge commit '8547ce6adaf218ea77c3062902f0cedf0347aa9c'
* commit '8547ce6adaf218ea77c3062902f0cedf0347aa9c':
add local flag to enable FPS w/o having to enable Config.DEBUG, which can have unintended costs
Merge commit '132570cbf4715fa13d237f1255848caf0dbd9d79'
* commit '132570cbf4715fa13d237f1255848caf0dbd9d79':
Delay 500ms between each registering each SDP record using sdptool.
Merge commit 'a4b0c0d00c80aa409ceb3f372cead2928fd4b601'
* commit 'a4b0c0d00c80aa409ceb3f372cead2928fd4b601':
Now that Eclair has been defined as API revision 5 mark Build.VERSION_CODES.ECLAIR as such.
Merge commit 'cd0d9603c3e54b484ec5046538f336f57a3678bf'
* commit 'cd0d9603c3e54b484ec5046538f336f57a3678bf':
Prevent transparent region from getting out of sync with Surface Flinger
queue of data chunks (sort of a blob-oriented logcat).
In the future, this will be coupled with a revised checkin service that
would actually upload this data.
Merge commit 'a614b948e18189adfe8e2553754db574ecb3fd7a'
* commit 'a614b948e18189adfe8e2553754db574ecb3fd7a':
Make PhoneStateListeners not call TelephonyManager
Setting WebCore cache limit depending on the memory class.
Merge commit '6815a67c5322cbde7768330fd12882d955abdd2a'
* commit '6815a67c5322cbde7768330fd12882d955abdd2a':
Add LAST_KMSG_KB variable, used to tune the size of /proc/last_kmsg uploads.
Merge commit '6195432b6fde3cda4bc7e2406c8f2975795933a7'
* commit '6195432b6fde3cda4bc7e2406c8f2975795933a7':
Fix for 2177367: Reduce duration of vibrate in RotaryLockScreen
Fix issue #2176944: Need API so browser, others can determine memory size of device
Fix issue #2177262: Improve animations
Fix issue #2174566: HOT STABILITY: NPE in activity manager
Merge commit '94f3a36326ddecaa09787d795451b0a229fe111c'
* commit '94f3a36326ddecaa09787d795451b0a229fe111c':
Remove STOPSHIP BT logging.
BT API security audit: fix a couple of permission mistakes.
Fix issue #2175693: Add vmallocinfo to dumpstate
add a way to easily catch and log GL errors (compile time flag)
GPS: Fix problem with SUPL when SUPL APN is already active.
Import revised translations. DO NOT MERGE
Fix issue 2174002: After rejecting Call when device ringtone is mute and playing music, audio is not transfered to BT device.
Import revised translations. DO NOT MERGE
Merge commit '0221ec55ac57f32a42fb1e7b66779ca955d58558'
* commit '0221ec55ac57f32a42fb1e7b66779ca955d58558':
Control H icon display in Status bar.
Fixes#2175599. Prevents an NPE when AttachInfo is null.
Set the Bond State to NONE when we receive a Agent Cancel.
Make vCard import Photo from vCard file :(
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 '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 '254d7ecd06aabc54fb1d2b9afd53b6e78045c6a9'
* commit '254d7ecd06aabc54fb1d2b9afd53b6e78045c6a9':
add (hidden) setHasAlpha() to allow clients like the view's cache to hint that a bitmap is opaque.
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
