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
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.
Merge commit 'fe17db4c023ea39dcbd971d64c3a5bcc6dd6fab9' into eclair-plus-aosp
* commit 'fe17db4c023ea39dcbd971d64c3a5bcc6dd6fab9':
Backport the change I30b141a2 from MR2 to MR1. Do not merge.
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.
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
Merge commit 'cfe45c775ddb5e48bf556aee7422298260eb4fd8' into eclair-plus-aosp
* commit 'cfe45c775ddb5e48bf556aee7422298260eb4fd8':
Fix for random audio output failures, properly dup() the file descriptor in IMediaPlayer::setDataSource to assume ownership as the caller will otherwise close it.
* changes:
Fix for random audio output failures, properly dup() the file descriptor in IMediaPlayer::setDataSource to assume ownership as the caller will otherwise close it.
Merge commit 'cc9a63dbc2b5569ef65ec3a04d86dbdfdee3f134' into eclair-plus-aosp
* commit 'cc9a63dbc2b5569ef65ec3a04d86dbdfdee3f134':
Add support for specifying the current LCD brightness mode to the backlight driver.
Merge commit '119a767565399809d222ddda6392e5e58942d5e6' into eclair-plus-aosp
* commit '119a767565399809d222ddda6392e5e58942d5e6':
Fix issue #2246723: Only one Application object gets onCreate called
Merge commit 'bf964e6a0488c25bfe18d2c041aafe42cf493b9e' into eclair-plus-aosp
* commit 'bf964e6a0488c25bfe18d2c041aafe42cf493b9e':
Check whether test server is up before running tests which use streaming files.
* changes:
Correction of an error in the setRotate method of the ColorMatrix class. The matrix rotation params around the 2nd axis was not set correctly:
Merge commit '13ce56bdbc4872c0b12caff501e063f5a75073db' into eclair-plus-aosp
* commit '13ce56bdbc4872c0b12caff501e063f5a75073db':
docs: add more documentation for the bluetooth apis.
Merge commit '88427cff609e668185010af2244500be5823595e' into eclair
* commit '88427cff609e668185010af2244500be5823595e':
docs: add more documentation for the bluetooth apis.
Merge commit '50c548d242d637328ec6b2c4987969b02695cc7d' into eclair-plus-aosp
* commit '50c548d242d637328ec6b2c4987969b02695cc7d':
Disabling user activity now resets user power state so the keyguard can set short screen timeout when keyguard is unhidden.
Merge commit 'ee2b094de0c5d7ffa64d51e7bd4ec3238be97113' into eclair-plus-aosp
* commit 'ee2b094de0c5d7ffa64d51e7bd4ec3238be97113':
Do not deactivate the proximity sensor until after the sensor returns negative.
Merge commit 'de342a01a0272540c8468fcfcf0f0067c0d743e0' into eclair-plus-aosp
* commit 'de342a01a0272540c8468fcfcf0f0067c0d743e0':
PowerManagerService: enable logging for when mPowerState changes.
Merge commit '11cff8cd30f03b5adb137e985532543da5e960c4' into eclair-plus-aosp
* commit '11cff8cd30f03b5adb137e985532543da5e960c4':
Add a way for wallpapers to know the delta between virtual screens.
