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.
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.
Merge commit '460965c2d944d046d00a65dc8675802a10d8aba3' into eclair-mr2-plus-aosp
* commit '460965c2d944d046d00a65dc8675802a10d8aba3':
Provide an API for apps to use a dynamic RFCOMM channel and SDP record.
Merge commit '24bb9b8af4ff691538fe9e517e8156016b0da6cd' into eclair-mr2
* commit '24bb9b8af4ff691538fe9e517e8156016b0da6cd':
Provide an API for apps to use a dynamic RFCOMM channel and SDP record.
Hide listenUsingRfcommOn(int channel)
Add listenUsingRfcomm(String name, ParcelUuid uuid)
The new API automatically finds a free RFCOMM channel and registers an SDP
record with the given uuid and name. The SDP record is automatically
removed when the socket is closed, or if the application dies.
Apps are prevented from registering SDP records with the uuid of system
Bluetooth profiles, such as A2DP, HFP and OPP.
Apps are prevented from removing SDP records that they did not create. This is
tracked by pid.
TODO: Provide an API for the connecting app to look up an SDP record.
Bug: 2158900
DrNo: eastham
Joke: "What did the dog say to the tree? bark."
Change-Id: Ia92f51c34615a7270a403255ad2b8faa98c4a3f5
Merge commit 'baad552dfd6e9d244659e7509ff958ec8f449c03' into eclair-mr2-plus-aosp
* commit 'baad552dfd6e9d244659e7509ff958ec8f449c03':
Fix issue #2166755: BroadcastReceiver trying to return result during a non-ordered broadcast
Merge commit '68d881cf2d2b252f6f795cd64d43e316a1d736e5' into eclair-mr2
* commit '68d881cf2d2b252f6f795cd64d43e316a1d736e5':
Fix issue #2166755: BroadcastReceiver trying to return result during a non-ordered broadcast
Tell the broadcast receiver whether it is getting an initial sticky value,
so it will be quiet about attempts to do ordered broadcast stuff.
Note that the original bug being reported was not actually a crash, just
an error log. So all we are doing here is making the log quieter.
Change-Id: Iaf1b718d82093ec1197142410a64feff47eb3859
Merge commit 'cb40ba2802f2f6e88a1ab9d583284d8afbec68a1' into eclair-mr2-plus-aosp
* commit 'cb40ba2802f2f6e88a1ab9d583284d8afbec68a1':
Make sure AsyncTask sens a null result to onPostExecute() when cancelled.
Merge commit '89c768435fc48a93c0af97f9f08e57a346b0a9fd' into eclair-mr2
* commit '89c768435fc48a93c0af97f9f08e57a346b0a9fd':
Make sure AsyncTask sens a null result to onPostExecute() when cancelled.
This is in accordance to the documentation. This bug was approved by hackbod.
The change is safe and is a single line of code.
Change-Id: I9b771df3ae2aa4f496d15e6c43b677f3245539ac
Merge commit '07086eb9dd351f716843ddc4ff7afbd15d25d49c' into eclair-mr2-plus-aosp
* commit '07086eb9dd351f716843ddc4ff7afbd15d25d49c':
Add cancel() VCardDataBuilder, which is intended to remove
* changes:
Add cancel() VCardDataBuilder, which is intended to remove a false alerm "Nested VCard code is not supported now." when importing vCard 3.0 file.
Merge commit '3448b676e9e7562a9b2de54951ac19eae43a6864' into eclair-mr2-plus-aosp
* commit '3448b676e9e7562a9b2de54951ac19eae43a6864':
Don't reinflate search bar when dialog is already showing
Merge commit '9e4c85614c861f095131ffa76e65cbba55d03d0a' into eclair-mr2
* commit '9e4c85614c861f095131ffa76e65cbba55d03d0a':
Don't reinflate search bar when dialog is already showing
