* 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 '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.
* 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 '55896f3c5121e73e3f657ed14e7ee8937ad72449' into eclair-mr2
* commit '55896f3c5121e73e3f657ed14e7ee8937ad72449':
Fix 2283089 - ERD47B: Force Close of Launcher2 process when hitting Search button to invoke QSB
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.)
Merge commit '7f8e34091efdee1a383280b08585f8254472c1fd' into eclair-mr2
* commit '7f8e34091efdee1a383280b08585f8254472c1fd':
Temporarily add explicit step to disable keyguard to imf tests to attempt solve test flakiness.
Merge commit '9dab667e03632181e487a04a8a170b3fa0bd5037' into eclair-mr2
* commit '9dab667e03632181e487a04a8a170b3fa0bd5037':
Force a crash under conditions where white square bug in all apps is likely to occur.
Merge commit '99f7b56fbea7e3e112fd0b570818b42a8ebd4ef5' into eclair-mr2
* commit '99f7b56fbea7e3e112fd0b570818b42a8ebd4ef5':
Fixing minor doc typo in android.widget.SimpleCursorAdapter.
Merge commit '8424ec323b2bc38887370c75e2c1fcd84bcdb013' into eclair-mr2
* commit '8424ec323b2bc38887370c75e2c1fcd84bcdb013':
Set metadata retriever thread group to the caller's group.
* changes:
Expand db_operation logging to prepare for widespread sample collection: - always enable the log, but subsample for queries faster than 100ms - add information about whether it's blocking a main thread - log the entire sql (have not yet added quoted-string-stripping)
Merge commit '39dbb099974f2c8e1154f28123e53be14c47a76d' into eclair-mr2
* commit '39dbb099974f2c8e1154f28123e53be14c47a76d':
Fix ref counting bug that could cause memory leak in allApps.
Merge commit '0d631b9b58db54bee58da717b38b8020bc3d0437' into eclair-mr2
* commit '0d631b9b58db54bee58da717b38b8020bc3d0437':
Add logging of headset events to help debug issue.
Merge commit '3fa1cb059e76d8b83634a4117a7b2ceca438ae7e' into eclair-mr2
* commit '3fa1cb059e76d8b83634a4117a7b2ceca438ae7e':
droiddoc change: add flag to offline docs build to signal
Merge commit '5e7f1fbe161d7015dde6e893351238749f906c8a' into eclair
* commit '5e7f1fbe161d7015dde6e893351238749f906c8a':
droiddoc change: add flag to offline docs build to signal
* changes:
droiddoc change: add flag to offline docs build to signal that we're building offline docs so that we do not generate all of the web pages for the sample apps source code.
