Merge commit '5a535026bfc1d091c0d029b21cc63f929c2def0a'
* commit '5a535026bfc1d091c0d029b21cc63f929c2def0a':
Make sdk version and code names static finals in PackageParser.
Merge commit '4613007b5755ed95a3a649909b4702400863f9b4'
* commit '4613007b5755ed95a3a649909b4702400863f9b4':
Make VCardComposer create the instance for mHandlerList.
Merge commit 'a1cb6a64c6710d46cc8673bc17db3bdb5c7bbc09'
* commit 'a1cb6a64c6710d46cc8673bc17db3bdb5c7bbc09':
Provide an API for apps to use a dynamic RFCOMM channel and SDP record.
Merge commit '4bc6158d6bdeff796cfd61d489c01db0d203534c'
* commit '4bc6158d6bdeff796cfd61d489c01db0d203534c':
Fix issue #2166755: BroadcastReceiver trying to return result during a non-ordered broadcast
Merge commit 'e1bf39bc764c78344dd2a6c59c5709919bdc1da9'
* commit 'e1bf39bc764c78344dd2a6c59c5709919bdc1da9':
Make sure AsyncTask sens a null result to onPostExecute() when cancelled.
Merge commit '36cad7be504608a538c845b4a44f0dcee157a338'
* commit '36cad7be504608a538c845b4a44f0dcee157a338':
Add cancel() VCardDataBuilder, which is intended to remove
Merge commit 'a4323999ecfaef42c70eec39b6a8f0bfcfaf2394'
* commit 'a4323999ecfaef42c70eec39b6a8f0bfcfaf2394':
Don't reinflate search bar when dialog is already showing
Merge commit '11782b905292ebde1b591f6561913affdfd415fc'
* commit '11782b905292ebde1b591f6561913affdfd415fc':
Extend the date time to handle the case where the
Merge commit '492eb109ff704c0dfec447a88920657cb230b8d6'
* commit '492eb109ff704c0dfec447a88920657cb230b8d6':
Work on issue #2163789: Way too much logging
Merge commit '0200394a0d8da5fd1a34e7366c1e021db8ccb46c'
* commit '0200394a0d8da5fd1a34e7366c1e021db8ccb46c':
bug 2161715: add the .jpg extension to the temp sdcard image file name so MMS can read the JPEG data using a file uri.
Merge commit 'fde23e398e9b880eec6269adf5afaca1f58e58f7'
* commit 'fde23e398e9b880eec6269adf5afaca1f58e58f7':
Fix a null pointer exception caught by the monkey.
Merge commit '9eca703d08ef2ef81796519fdd60a774380c7d4c'
* commit '9eca703d08ef2ef81796519fdd60a774380c7d4c':
setupRedirect() can throw. Catch it and signal the error.
Merge commit '86806ce11a89260147d7c2efa2c192b711d923db'
* commit '86806ce11a89260147d7c2efa2c192b711d923db':
Process synchronous requests in the same RequestQueue.
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
