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 'a95e1cd1f846a949663e33e5a93f689702415b5a'
* commit 'a95e1cd1f846a949663e33e5a93f689702415b5a':
Work on issue #2163789: Way too much logging
Merge commit '84ec90cbdf950bfa129c30d504f117178c3e3ade'
* commit '84ec90cbdf950bfa129c30d504f117178c3e3ade':
Fix for 2129239: Always enable the menu hard key in LockScreen when 'ro.monkey' is set.
Merge commit 'dafe18ee8c8d7923580b0d6d03d44ffdb00372e6'
* commit 'dafe18ee8c8d7923580b0d6d03d44ffdb00372e6':
Make sure we wake up the screen if the keyguard is not visible when we think it should be.
Merge commit '492eb109ff704c0dfec447a88920657cb230b8d6'
* commit '492eb109ff704c0dfec447a88920657cb230b8d6':
Work on issue #2163789: Way too much logging
Merge commit '77df9d6e0ca56a34c66a1e30e9696085ddbd9038' into eclair-mr2-plus-aosp
* commit '77df9d6e0ca56a34c66a1e30e9696085ddbd9038':
Delay 500ms between each registering each SDP record using sdptool.
Merge commit '7fa610638b09f2a4a29d7df1b16d2fe686b5e5e6' into eclair-mr2-plus-aosp
* commit '7fa610638b09f2a4a29d7df1b16d2fe686b5e5e6':
Fix issue #2179931: Power key to wake up frequently ignored when in dock app
Merge commit '13a7d5917a4f0665cccdfd508351e447e5fadb40'
* commit '13a7d5917a4f0665cccdfd508351e447e5fadb40':
decode the search string before putting it into the search control.
Merge commit 'b3ac54771e6d5dd2a173797c9daf3efa317fa29d'
* commit 'b3ac54771e6d5dd2a173797c9daf3efa317fa29d':
Update the SimpleMesh API to support new attribute types. Also spilt add/set commands to avoid permutation explosion.
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 '7d638292969687ed4557d36e741e1275d2052fb0'
* commit '7d638292969687ed4557d36e741e1275d2052fb0':
Change way we choose EGL surfaces to be compatible with the native
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 'd301c90446644f63cda9b9263f83332676065bb4' into eclair-plus-aosp
* commit 'd301c90446644f63cda9b9263f83332676065bb4':
Delay 500ms between each registering each SDP record using sdptool.
Merge commit 'f836acf241f10d943d72d439fa425fda73a6d56b' into eclair-plus-aosp
* commit 'f836acf241f10d943d72d439fa425fda73a6d56b':
Fix issue #2179931: Power key to wake up frequently ignored when in dock app
Merge commit 'd301c90446644f63cda9b9263f83332676065bb4' into eclair-mr2
* commit 'd301c90446644f63cda9b9263f83332676065bb4':
Delay 500ms between each registering each SDP record using sdptool.
Merge commit 'f836acf241f10d943d72d439fa425fda73a6d56b' into eclair-mr2
* commit 'f836acf241f10d943d72d439fa425fda73a6d56b':
Fix issue #2179931: Power key to wake up frequently ignored when in dock app
This is to workaround an issue where SDP records will fail to register using
sdptool. When we run SystemService.start() it forks sdptool, so if we do this
four times in a row these forked processes can run in parallel, and one or
more of them fails. There is probably some thready safety issue in sdptool
or Bluez that makes it unsafe to run sdptool in parallel.
As a workaround, delay 500ms between each run of sdptool to register SDP
records when starting Bluetooth.
Before this fix it was easy to reproduce problems with service record
registration. If you turn BT off/on multiple times you can see that sometimes
one or more service records are missing. Repro rate is about 20% in my tests.
Result is that remote devices cannot connect to the missing service.
After this fix I am unable to reproduce any missing SDP records, after 30+
cycles of BT on/off. Motorola BT team also ran stress tests overnight with this
fix and were unable to reproduce the missing SDP records.
This is a low risk fix. It does delay some records from being registered
by an additional 1.5 seconds (on top of the 3 second delay we already had),
so if you try and very quickly connect a BT service after turning BT on it
won't work the first time.
Do not merge. (I will use a less hacky fix for MR2/Master)
Change-Id: I305c181c3194e8ce25e3825320cc2e1ef6d3d3cc
Bug: 2180800
DrNo: eastham
Joke: Why can't you play cards in the jungle? Because there's too many cheetas!
