Merge commit '89c768435fc48a93c0af97f9f08e57a346b0a9fd' into eclair-plus-aosp
* commit '89c768435fc48a93c0af97f9f08e57a346b0a9fd':
Make sure AsyncTask sens a null result to onPostExecute() when cancelled.
Merge commit '9e4c85614c861f095131ffa76e65cbba55d03d0a' into eclair-plus-aosp
* commit '9e4c85614c861f095131ffa76e65cbba55d03d0a':
Don't reinflate search bar when dialog is already showing
Merge commit '48e6725c828a8d420d43925b0c9a9a915a8c4e2f' into eclair-plus-aosp
* commit '48e6725c828a8d420d43925b0c9a9a915a8c4e2f':
Work on issue #2163789: Way too much logging
Merge commit '6b3707452c5921c89258371eec140b0fb76766f8' into eclair-plus-aosp
* commit '6b3707452c5921c89258371eec140b0fb76766f8':
bug 2161715: add the .jpg extension to the temp sdcard image file name so MMS can read the JPEG data using a file uri.
Don't hold a lock when the activity thread is telling the activity manager
to release a provider.
This requires that the activity manager now keep a reference count on the
providers, because without the lock it is possible for activity thread to
call in to request the provider again before it has finished telling
about the release.
Change-Id: I5f912903891f4edae85e28819d4e6f14b8f2e688
When the focus bounds is changed by webkit, reflect that
change on the UI side in the WebTextView. On the WebCore
side, add the focus-changed state to the Draw record,
which is sent whenever a new picture is recorded.
On the WebView side, set a bit when receiving the Draw
record, and check that bit when the picture is first drawn.
This additional delay is required so that the bit isn't
checked until after the new nav cache is swapped in.
If the bit is set when the draw occurs, clear it, and
set up the WebTextView's bounds.
companion change in external/webkit
fixes http://b/issue?id=2118781
This fixes an NPE that occurs when launching the intent
tries to access state cleared by onStop.
Bug: 2171752
Change-Id: I29232f2a44d8dfa27b2c79933093c0c8983b2e92
Merge commit '19400067b2bca066255118315877125d1e623cad' into eclair-mr2-plus-aosp
* commit '19400067b2bca066255118315877125d1e623cad':
Fix back button handling in ACTV
Merge commit '4625758d0b909ccfc9f40b707666b1b21e9e8ffd' into eclair-mr2
* commit '4625758d0b909ccfc9f40b707666b1b21e9e8ffd':
Fix back button handling in ACTV
Merge commit '13ed5750ba515c3b4345937c7a11667a90cb1265' into eclair-mr2-plus-aosp
* commit '13ed5750ba515c3b4345937c7a11667a90cb1265':
Add group id to getThumbnail and cancelThumbnailRequest API.
Merge commit 'e8830120c8e416a26520dfbbd0e386e77255dbda' into eclair-mr2-plus-aosp
* commit 'e8830120c8e416a26520dfbbd0e386e77255dbda':
Turn some logging back on in ConnectionManager
Merge commit '92b5caa4e21d48db6efeddba532d1546c6e686b1' into eclair-mr2
* commit '92b5caa4e21d48db6efeddba532d1546c6e686b1':
Turn some logging back on in ConnectionManager
Merge commit '77a7bdce65977539654d60d5d7e286d7ae84dd4c' into eclair-mr2-plus-aosp
* commit '77a7bdce65977539654d60d5d7e286d7ae84dd4c':
- hide Entity and all its references
Merge commit 'ef3c63ad20c4c45c0ae1748a67b5f33d26415938' into eclair-mr2-plus-aosp
* commit 'ef3c63ad20c4c45c0ae1748a67b5f33d26415938':
Make sdk version and code names static finals in PackageParser.
AutoCompleteTextView.onKeyPreIme() used
getKeyDispatcherState().startTracking(event, this) to start tracking
the back button, but didn't update the state of the event
before checking event.isTracking().
Fixes http://b/issue?id=2167168
"AutoCompleteTextView back button handling is broken"
Change-Id: I2c5f1e761872b9e02d85ff6f958fabd558d041a0
Merge commit '5bba632d877c2878384ff21566c8eb6a1a22f37b' into eclair-mr2
* commit '5bba632d877c2878384ff21566c8eb6a1a22f37b':
- hide Entity and all its references
- remove updateEntity and insertEntity, since they are not
used
- add the RawContacts.Entity class, which is used in lieu of the
android.content.Entity
Merge commit '5163cd6d1cb664977eb4473b98657c7e92ae430e' into eclair-mr2
* commit '5163cd6d1cb664977eb4473b98657c7e92ae430e':
Make sdk version and code names static finals in PackageParser.
* changes:
Make sdk version and code names static finals in PackageParser. Remove api to set these values. Remove an unused method in AppSecurityPermissions
Merge commit '629f94fac71856bea9694d6db4f6b955c5f50651' into eclair-mr2-plus-aosp
* commit '629f94fac71856bea9694d6db4f6b955c5f50651':
Make VCardComposer create the instance for mHandlerList.
Merge commit 'ccc214b21edaaddf46960388ec4d3e3ca89a01ae' into eclair-mr2
* commit 'ccc214b21edaaddf46960388ec4d3e3ca89a01ae':
Make VCardComposer create the instance for mHandlerList.
Previously the creation was delayed until addHandler(), which
had been required to be called.
However, after VCardComoser's support toward PBAP stuffs,
the guarantee was not true any more.
So by creating the instance in constructor, we refrain NPE during
finalize() when PBAP uses VCardComposer.
