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 '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 'd301c90446644f63cda9b9263f83332676065bb4' into eclair-mr2
* commit 'd301c90446644f63cda9b9263f83332676065bb4':
Delay 500ms between each registering each SDP record using sdptool.
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!
Merge commit '5d93de7393bf01095e79af0f3586930ddd9ffeeb' into eclair-mr2-plus-aosp
* commit '5d93de7393bf01095e79af0f3586930ddd9ffeeb':
Now that Eclair has been defined as API revision 5 mark Build.VERSION_CODES.ECLAIR as such.
Merge commit '1bb5550107eae60993dc35f2e917cb664f841255' into eclair-mr2-plus-aosp
* commit '1bb5550107eae60993dc35f2e917cb664f841255':
Prevent transparent region from getting out of sync with Surface Flinger
Select plugin using focusCandidate rather than cursor
calls. This allows the detecting plugin objects that
have received focus but don't have the cursor ring
on them.
Remove 'inval rect' from debugging printfs, since it
happens a lot, and allow 'request keyboard' to be
visible.
Merge commit '6dc3f4e553d333b9f115a222a9a684bb2aa55b5e' into eclair-mr2
* commit '6dc3f4e553d333b9f115a222a9a684bb2aa55b5e':
Now that Eclair has been defined as API revision 5 mark Build.VERSION_CODES.ECLAIR as such.
The ViewRoot is responsible for calculating the current view's surface's
transparent region and reporting this to the window server, which in
turn notifies Surface Flinger.
To minimize cross-process traffic, ViewRoot keeps track of the
most recent transparent region that it has reported to the window
server, and only sends updates when the region shape changes.
ViewRoot is effectively shadowing the internal state of the window
server, and usually this works fine, because ViewRoot is usually the
only thing that changes this value.
But when the surface is recreated, the window server resets the
transparent region to empty. So in order to properly update the window
server we need to reset our copy of its state to empty too.
Fixes issue #2133090: GL Gears runs at half speed in some cases
Note that refactor is still on-going. Some changes done now may be
reverted in the future.
- Move reusable constants from VCardComposer to Constants.
- Make ContactStruct appropriately refers to Constants.
- Move PBAP-related code at the bottom of vCard composer
- Remove some redundant code.
Internal issue number: 2160039
Implement java side of file upload. Requires changes to external/
webkit to not break; requires changes to packages/apps/Browser
before it actually is used.
Fix http://b/issue?id=675743
Merge commit '6903d5cedcffa005818c497f672cf16c2dff619c' into eclair-plus-aosp
* commit '6903d5cedcffa005818c497f672cf16c2dff619c':
Add LAST_KMSG_KB variable, used to tune the size of /proc/last_kmsg uploads.
Merge commit '6903d5cedcffa005818c497f672cf16c2dff619c' into eclair-mr2
* commit '6903d5cedcffa005818c497f672cf16c2dff619c':
Add LAST_KMSG_KB variable, used to tune the size of /proc/last_kmsg uploads.
Merge commit '5a016488da5ff6c1ecdff0b1febd836cc1711531' into eclair-mr2-plus-aosp
* commit '5a016488da5ff6c1ecdff0b1febd836cc1711531':
Develop ContentResolver-based unit tests for vCard importer and fix vCard code
along with the tests
Make test code not only check the validity of VCardParser but also check
the validity of the data insertion part of ContactStruct class, using
MockContentResolver/MockContentProvider. With these tests, we are now really sure
vCard side appropriately sends vCard data into the resolver.
Fix ContactStruct so that it properly handles ORG property and TITLE property,
though it still does not see Group information. There's no vCard found which
uses Group and ORG and TITLE in convolted orders...
e.g. Current implementation misinterprets the following case, but we're not sure
whether any exporter emits data in this kind of complicated form...
group2.ORG:ComparyA
group1.ORG:CompanyB
group1.TITLE:TitleForA
group2.TITLE:TitleForB
Expected: CompanyA + TitleForA, CompanyB + TitleForB
Actual: CompanyA + TitleForB, CompanyB + TitleForA
Also change the parser part a little, so that some component can be reused via
the other part of vCard code.
Added several additional files for the tests, which ensures that
- ORG/TITLE properties are handled as we expect.
- PREF is appropriately handled and passed to the resolver as "IS_PRIMARY" flag.
-- We discarded the code which ensures that "IS_PRIMARY" is added to only one
field in each type, after the local discussion (the duplication or no primary
state should be handled by the resolver).
Internal Issue number: 2160039
Merge commit 'ad60e7fe2c9588cd16c1351419af90964beb232d' into eclair-plus-aosp
* commit 'ad60e7fe2c9588cd16c1351419af90964beb232d':
Fix for 2177367: Reduce duration of vibrate in RotaryLockScreen
Merge commit '2c6c5e6e49795e6e24cd089c9018377d837ba931' into eclair-plus-aosp
* commit '2c6c5e6e49795e6e24cd089c9018377d837ba931':
Fix issue #2176944: Need API so browser, others can determine memory size of device
