Merge commit 'bf5b632abbc2f4b96323ff428be585fd2a3d381c' into eclair-plus-aosp
* commit 'bf5b632abbc2f4b96323ff428be585fd2a3d381c':
Use getViewHeightWithTitle() to honor the scrollbar
Merge commit 'd7439f4bdb31d005011b69112e82a9fed9be4470' into eclair-plus-aosp
* commit 'd7439f4bdb31d005011b69112e82a9fed9be4470':
Use computeVerticalScrollRange() to find the bottom
Merge commit 'c996689109b1ac0849aa675e1987e3851ee77a95' into eclair-plus-aosp
* commit 'c996689109b1ac0849aa675e1987e3851ee77a95':
Return an empty PluginList instead of null for the
Merge commit '2f92bd3ecb45e2690dcdc9c09564a1b3805f673b' into eclair-plus-aosp
* commit '2f92bd3ecb45e2690dcdc9c09564a1b3805f673b':
Fix for 2209086: Initial pass at new SlidingTab widget and integration into LockScreen.
Merge commit '38210df337a1485bd3d2eb5adc223f443fe1b5b0' into eclair-plus-aosp
* commit '38210df337a1485bd3d2eb5adc223f443fe1b5b0':
Throttle nitz updates as the are too numerous on cdma.
Merge commit '250aa068eae7424d454fc65ea83c8a65ca717112' into eclair-plus-aosp
* commit '250aa068eae7424d454fc65ea83c8a65ca717112':
Fix issue #2248951: Need to turn off touch filtering outside of sholes
This flag is necessary for applications to specifythat their daa is never to be encrypted when the encrypted file system feature is
commplete and enabled.
Encrypted File Systems project.
Adding android:neverEncrypt flag to AndroidManifest.XML to allow packages to opt-out from EFS features.
Encrypted File Systems Project.
Fixing white spaces and end-line issues.
Encrypted File SYstems Project: opt-out flag.
Removed AndroidManifest.xml changes, as will make that change in a separate integration.
This change goes with a kernel driver change that reduces the audio buffer size from 4800 bytes (~27ms) to 3072 bytes (~17ms).
- The AudioFlinger modifcations in change 0bca68cfff have been removed: the short sleep period was counter productive when the AudioTrack is using the call back thread as it causes to many preemptions.
- AudioFlinger mixer thread now detects long standby exit time and in this case anticipates start by writing 0s as soon as a track is enabled even if not ready for mixing.
- AudioTrack::start() is modified to start call back thread before starting the IAudioTrack so that thread startup time is masked by IAudioTrack start and mixer thread wakeup time.
Merge commit '48515f495b29c01b473579825d5ba5e690ff5db7' into eclair-mr2
* commit '48515f495b29c01b473579825d5ba5e690ff5db7':
Fix issue #2170897: wallpaper touch-up event not seen when exiting lock screen
Merge commit 'b9c40a65c7fb2121d3076a522248574162bf5f8c' into eclair-plus-aosp
* commit 'b9c40a65c7fb2121d3076a522248574162bf5f8c':
Make vCard parser invalid lines in vCard file which look like some comment. Do not merge.
Merge commit 'e464de6b764348a102ae64417d22bbd1c80723dc' into eclair-plus-aosp
* commit 'e464de6b764348a102ae64417d22bbd1c80723dc':
Make vCard exporter check invalid phone numbers and re-format them if needed. Do not merge.
This change is based on the change I319bf9ee, but different in that there's no test, since
test framework for vCard code is just in MR2, not in MR1.
Internal issue number: 2246410
Dr.NO: Hiroshi
Merge commit 'fe17db4c023ea39dcbd971d64c3a5bcc6dd6fab9' into eclair-plus-aosp
* commit 'fe17db4c023ea39dcbd971d64c3a5bcc6dd6fab9':
Backport the change I30b141a2 from MR2 to MR1. Do not merge.
- Added includeDetailedStats metadata to TimedTest for collecting additional
metrics like memory usage and binder transactions
- Added PerformanceCollectorTestCase interface for hard-typing test class as
performance test while still able to inherit from instrumenation test classes
- Reverted previous changes to PerformanceTestBase, will deprecate
PerformanceTestBase/Case in a future CL
- Removed 'performance.' prefix from keys written to instrumentation output
The previous implementation selected the first ContactValues object even when its name fields are all empty.
This time, vCard composer checks the name fields and skip the object without valid name.
One exception is the object with IS_SUPER_PRIMARY flag. If IS_SUPER_PRIMARY flag is set, the object will be
selected even when the object does not have valid name.
Dr.NO: Hiroshi
Internal issue number: 2252304
Merge commit 'fbac9bdfd40b0676a914e9dae7bdd26829087cae'
* commit 'fbac9bdfd40b0676a914e9dae7bdd26829087cae':
Make vCard composer use ContentValues object with non-empty name unless the object is not marked as IS_SUPER_PRIMARY.
Merge commit '0cda59112526c03f3b8be0eb885926b7515df756' into eclair-mr2-plus-aosp
* commit '0cda59112526c03f3b8be0eb885926b7515df756':
Make vCard composer use ContentValues object with non-empty name unless the object is not marked as IS_SUPER_PRIMARY.
Some camera HALs spin up a preview thread and need to wait for
the thread to exit. This can create a potential deadlock. In
stopPreview, we take the main lock. If a preview callback occurs
while the lock is held, the preview thread will block. If the
camera HAL is waiting for the preview thread to exit, this will
cause a deadlock.
This patch breaks out the preview buffer heap into a separate
mutex. This mutex is never held when the main lock is held, thus
preventing the deadlock from occuring.
Previous change selected the first ContactValues object even when its name fields are all empty.
This time, vCard composer checks the name fields and skip the object withouth valid name.
One exception is the object with IS_SUPER_PRIMARY flag. If IS_SUPER_PRIMARY flag is set, the object will be
selected even when the object does not have valid name.
Add a unit test for this fix.
Internal issue number: 2252304
Merge commit 'ae0cf6dc9eb92282ef92b00ac68bfaca8aad2a1e' into eclair-plus-aosp
* commit 'ae0cf6dc9eb92282ef92b00ac68bfaca8aad2a1e':
Make the RegisteredSErvices Cache not allow the registered service for a
* changes:
Make the RegisteredSErvices Cache not allow the registered service for a type to change without first uninstalling the previous service for that type, unless the newly installed service is in the system image.
Merge commit '48515f495b29c01b473579825d5ba5e690ff5db7' into eclair-plus-aosp
* commit '48515f495b29c01b473579825d5ba5e690ff5db7':
Fix issue #2170897: wallpaper touch-up event not seen when exiting lock screen
