* changes:
Change the DropBoxManager API slightly (this is public, but not yet released) -- take a File instead of a ParcelFileDescriptor (gets opened internally) -- that way the caller doesn't have to worry about closing their PFD and so on. (Pretty much 100% of the time the caller will be uploading a file, anyway.)
Merge commit 'f6a1dab030095ad1ed58d387ff21a112bca5b610'
* commit 'f6a1dab030095ad1ed58d387ff21a112bca5b610':
Add setAttentionLight() to IPowerManager for the Phone app.
Merge commit 'f3e291a05d1e30fe409b06ca43538ca22ee2e69b' into eclair-mr2-plus-aosp
* commit 'f3e291a05d1e30fe409b06ca43538ca22ee2e69b':
Add setAttentionLight() to IPowerManager for the Phone app.
Merge commit 'a85a0ac1072c7653fdafa791416658154b76ac0d' into eclair-mr2-plus-aosp
* commit 'a85a0ac1072c7653fdafa791416658154b76ac0d':
close file descriptors passed to drop box
Merge commit '30348b0de11b6c6cba43dfc7960e4d2084af6d8b' into eclair-mr2-plus-aosp
* commit '30348b0de11b6c6cba43dfc7960e4d2084af6d8b':
Remove HardwareService and move vibrator support to VibratorService.
Merge commit '5f69f7260ff34b2bed7cc3309f91b750f1a833d3' into eclair-mr2-plus-aosp
* commit '5f69f7260ff34b2bed7cc3309f91b750f1a833d3':
cdma tones: Fix Call Waiting Tone in the hash map
Merge commit '0e1fcb16940fe7a219ee75012b3f010432ed699f'
* commit '0e1fcb16940fe7a219ee75012b3f010432ed699f':
When clicking on a WebTextView, always call nativeMotionUp.
Merge commit 'f90b1261a53bc0bfc772337551eb4c540022cd22' into eclair-mr2-plus-aosp
* commit 'f90b1261a53bc0bfc772337551eb4c540022cd22':
When clicking on a WebTextView, always call nativeMotionUp.
Merge commit '08878156e6239cf1dd03bfbd4a108bcefad16b17'
* commit '08878156e6239cf1dd03bfbd4a108bcefad16b17':
Rename WebChromeClient.addMessageToConsole to WebChromeClient.onConsoleMessage. Do not merge.
Update JavaDoc for CacheManger.CacheResult, WebChromeClient.getDefaultVideoPoster and WebChromeClient.getVideoLoadingProgressView. Do not merge.
Improves documentation for GeolocationPermissions class. Do not merge.
Merge commit 'a2d259aa4a06eb92af2ef4530ae065497a581496' into eclair-mr2-plus-aosp
* commit 'a2d259aa4a06eb92af2ef4530ae065497a581496':
Rename WebChromeClient.addMessageToConsole to WebChromeClient.onConsoleMessage. Do not merge.
Update JavaDoc for CacheManger.CacheResult, WebChromeClient.getDefaultVideoPoster and WebChromeClient.getVideoLoadingProgressView. Do not merge.
Improves documentation for GeolocationPermissions class. Do not merge.
Merge commit '7f7c16dee2f825f37aec4d457bdf5ec9b8109a47' into eclair-mr2
* commit '7f7c16dee2f825f37aec4d457bdf5ec9b8109a47':
Rename WebChromeClient.addMessageToConsole to WebChromeClient.onConsoleMessage. Do not merge.
Update JavaDoc for CacheManger.CacheResult, WebChromeClient.getDefaultVideoPoster and WebChromeClient.getVideoLoadingProgressView. Do not merge.
Improves documentation for GeolocationPermissions class. Do not merge.
* changes:
Rename WebChromeClient.addMessageToConsole to WebChromeClient.onConsoleMessage. Do not merge.
Update JavaDoc for CacheManger.CacheResult, WebChromeClient.getDefaultVideoPoster and WebChromeClient.getVideoLoadingProgressView. Do not merge.
Improves documentation for GeolocationPermissions class. Do not merge.
Merge commit '1ffa3c01a90f7e85aacb77163464b689d68f44cd'
* commit '1ffa3c01a90f7e85aacb77163464b689d68f44cd':
Fix a bug in the Settings contract class (introduced in an ... iffy ... fix
Merge commit 'ee6c7e491bac0ee12a4c662cd0bd21c7a8cb2f16' into eclair-mr2-plus-aosp
* commit 'ee6c7e491bac0ee12a4c662cd0bd21c7a8cb2f16':
Fix a bug in the Settings contract class (introduced in an ... iffy ... fix
* changes:
Fix a bug in the Settings contract class (introduced in an ... iffy ... fix to a race condition) that breaks the caching of non-existent Settings/Secure/ Gservices values (causing lots of unnecessary database queries).
Merge commit '8bfa77b0e2de840678c026da0fc5ca1ce03d0c1a'
* commit '8bfa77b0e2de840678c026da0fc5ca1ce03d0c1a':
Fix 2283089 - ERD47B: Force Close of Launcher2 process when hitting Search button to invoke QSB
Merge commit 'df7edf5d92ae3e708e802b68014864fe13184060' into eclair-mr2-plus-aosp
* commit 'df7edf5d92ae3e708e802b68014864fe13184060':
Fix 2283089 - ERD47B: Force Close of Launcher2 process when hitting Search button to invoke QSB
Merge commit '55896f3c5121e73e3f657ed14e7ee8937ad72449' into eclair-mr2
* commit '55896f3c5121e73e3f657ed14e7ee8937ad72449':
Fix 2283089 - ERD47B: Force Close of Launcher2 process when hitting Search button to invoke QSB
Merge commit '8e2eb583e73e1e4813999bc0f49cc26d8d63bcb8' into eclair-mr2-plus-aosp
* commit '8e2eb583e73e1e4813999bc0f49cc26d8d63bcb8':
Add China data to MccTable.
Merge commit '40f92fe967f36d524d173b7819dc875af2cd9971'
* commit '40f92fe967f36d524d173b7819dc875af2cd9971':
When using MDP, we needed to use a texture for diming.
Merge commit '1e22cffa1d7299e725ec2a16689901aaa5790922' into eclair-mr2-plus-aosp
* commit '1e22cffa1d7299e725ec2a16689901aaa5790922':
When using MDP, we needed to use a texture for diming.
Merge commit 'b29fefe6aeed68c22c7711263357348006ab8b79' into eclair-mr2-plus-aosp
* commit 'b29fefe6aeed68c22c7711263357348006ab8b79':
Copy SYSTEM_LAST_KMSG from /proc/last_kmsg instead of /data/dontpanic/last_kmsg.
Merge commit '638514048141bf9f28a4bede77b83c3238f5c194' into eclair-mr2
* commit '638514048141bf9f28a4bede77b83c3238f5c194':
When using MDP, we needed to use a texture for diming.
* changes:
Copy SYSTEM_LAST_KMSG from /proc/last_kmsg instead of /data/dontpanic/last_kmsg. (In preparation for not copying to /data/dontpanic/last_kmsg at all.)
