Merge commit '99cee0318bdceb6e996bbe9a3e0f961d622e0365' into eclair-mr2-plus-aosp
* commit '99cee0318bdceb6e996bbe9a3e0f961d622e0365':
Change the DropBoxManager API slightly (this is public, but not yet released) --
* 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 'f3e291a05d1e30fe409b06ca43538ca22ee2e69b' into eclair-mr2-plus-aosp
* commit 'f3e291a05d1e30fe409b06ca43538ca22ee2e69b':
Add setAttentionLight() to IPowerManager for the Phone app.
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 '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.
The lights support is only needed by PowerManagerService and NotificationManagerService, so we do not need a Binder API for it.
Move backlight and notification light support to new LightsService class.
The camera flash is now handled directly by the camera HAL, so the flash Hardware service flash support is obsolete.
Change-Id: I086d681f54668e7f7de3e8b90df3de19d59833c5
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '5f69f7260ff34b2bed7cc3309f91b750f1a833d3' into eclair-mr2-plus-aosp
* commit '5f69f7260ff34b2bed7cc3309f91b750f1a833d3':
cdma tones: Fix Call Waiting Tone in the hash map
Merge commit 'f90b1261a53bc0bfc772337551eb4c540022cd22' into eclair-mr2-plus-aosp
* commit 'f90b1261a53bc0bfc772337551eb4c540022cd22':
When clicking on a WebTextView, always call nativeMotionUp.
We were previously calling nativeTextInputMotionUp, which was
intended to be faster than nativeMotionUp, which does more work.
However, as discussed in http://b/issue?id=2257787 , I think we
should simply call nativeMotionUp, which does everything the old
method did, while also correcting things if necessary. This fixes
the second problem listed in http://b/issue?id=2266756 , since
nativeMotionUp will recognize that the <select> element should
take the click.
Since I have removed a native method, this requires a change to
external/webkit.
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 '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).
to a race condition) that breaks the caching of non-existent Settings/Secure/
Gservices values (causing lots of unnecessary database queries).
Fix a dumb thinko (reversed condition) in the SQLiteDatabase logging.
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
In this case, as opposed to what was happening in 1977685, the focused view wasn't the one that was
directly removed, it was a child of the removed view.
Merge commit '8e2eb583e73e1e4813999bc0f49cc26d8d63bcb8' into eclair-mr2-plus-aosp
* commit '8e2eb583e73e1e4813999bc0f49cc26d8d63bcb8':
Add China data to MccTable.
1. PRIORITY_OFF is when user unchecks A2DP connection profile box.
2. By default, when you bond, it will be PRIORITY_ON.
3. When the profile gets connected, the priority gets set to
PRIORITY_AUTO_CONNECT. This means that we will connect
automatically to this profile.
4. When the user disconnects, we downgrade the priority to PRIORITY_ON,
which means we won't reconnect automatically.
a) We need to make a similar change to Handsfree profile.
b) We need to rework the profile management design and code which
will fix the 6 second timer that we have for A2DP reconnection.
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.
