Merge commit '7fd752af7507e9f3d3e28f8e646f53f16373c02d'
* commit '7fd752af7507e9f3d3e28f8e646f53f16373c02d':
Prevent getFile from copying when the file is too large.
Merge commit 'b4b5f2af456acef83e69d4aa4b28b42a1859be7d'
* commit 'b4b5f2af456acef83e69d4aa4b28b42a1859be7d':
Enabling plugin surfaces to update their position in the UI.
Merge commit 'd6e86a687d57851b90d025ae33a8e4021bffe10d'
* commit 'd6e86a687d57851b90d025ae33a8e4021bffe10d':
Throttle camera preview frames to the app. Bug 2180302.
Merge commit '4d915e00dcf40143f9caf89fd8eeadd32a8cb6f4'
* commit '4d915e00dcf40143f9caf89fd8eeadd32a8cb6f4':
Continue caching "POST" result so that we won't get
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 '5a4f64fcbf0382f33e9f79e6d0497113b972690e' into eclair-mr2-plus-aosp
* commit '5a4f64fcbf0382f33e9f79e6d0497113b972690e':
Prevent getFile from copying when the file is too large.
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 '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
