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 '3537b9d86ee900424b6a2e98056d837663de7390'
* commit '3537b9d86ee900424b6a2e98056d837663de7390':
Make the text bit transparent to allow the correct color to show through
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 '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
- Remove one pixel of margin from the left of the voice
search button icon.
- Move magnifying glass icon one pixel downwards (= remove
one pixel of padding at the bottom and add one at the top).
- Remove one pixel of margin from the bottom of the button
backgrounds.
- Remove one pixel of padding from the left of the
search button background.
- Remove one pixel of padding from the left and add one to
the right of the voice search button background.
Fixes http://b/issue?id=2160857
"Pixel tweak search layouts to match widget"
Change-Id: I76d7ba6128f13f3d29b03a89e9862df355874e06
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.
