Merge commit '7580493b014a2c7ea883cd291255798dc72ebbff' into eclair-mr2
* commit '7580493b014a2c7ea883cd291255798dc72ebbff':
Implement feature #2117336: Create event communication APIs for live wallpaper
Merge commit 'ae27c576643a821d78ef330a5e1834c42d2cc94a'
* commit 'ae27c576643a821d78ef330a5e1834c42d2cc94a':
Make MockCursor class a part of public SDK.
With this class, external developers will be able to reduce their
redundant work related to testing around ContentProvider/ContentResolver.
Internal Issue number: 2181010
Merge commit '007a429f09fb9e4e4fbd4205d03878874c9f7957' into eclair-mr2
* commit '007a429f09fb9e4e4fbd4205d03878874c9f7957':
Update 5.xml with last minute changes.
This change is likely incomplete and perhaps not right in other ways.
The gist of the change is that the span can return the number of lines
to which to apply the "leading margin".
Some specific things that should be looked at:
1) if the user has nested multiple
LeadingMarginSpans then they will inherit the "line count" feature.
This is wrong but I didn't want to spend time fixing it until it
was clear that this overall approach was acceptible.
2) The units for how many lines should indented is "lines" rather than
something like dips.
3) I wasn't sure what our strategy was for binary compatibility so
I didn't want to modify the methods in LeadingMarginSpan. Instead I
made another interface with extends LeadingMarginSpan that has the
extra method to return the line count.
Merge commit 'e020ff61750d8b1e9a4d8880391472598af173e3'
* commit 'e020ff61750d8b1e9a4d8880391472598af173e3':
Making new Contacts APIs visible in Eclair SDK - Part II
Merge commit 'fe4c8715c02a8b723c56e3e48ededa657c9ab6a6' into eclair-mr2
* commit 'fe4c8715c02a8b723c56e3e48ededa657c9ab6a6':
Making new Contacts APIs visible in Eclair SDK - Part II
Merge commit '767741ffd5d14471b88791e5db93c08e8d2571eb'
* commit '767741ffd5d14471b88791e5db93c08e8d2571eb':
Making new Contacts APIs visible in Eclair SDK
Merge commit '6e144ad885f6cc3f090616a7ad4911d093049ad1' into eclair-mr2
* commit '6e144ad885f6cc3f090616a7ad4911d093049ad1':
Making new Contacts APIs visible in Eclair SDK
Merge commit 'a4b0c0d00c80aa409ceb3f372cead2928fd4b601'
* commit 'a4b0c0d00c80aa409ceb3f372cead2928fd4b601':
Now that Eclair has been defined as API revision 5 mark Build.VERSION_CODES.ECLAIR as such.
Merge commit '6195432b6fde3cda4bc7e2406c8f2975795933a7'
* commit '6195432b6fde3cda4bc7e2406c8f2975795933a7':
Fix for 2177367: Reduce duration of vibrate in RotaryLockScreen
Fix issue #2176944: Need API so browser, others can determine memory size of device
Fix issue #2177262: Improve animations
Fix issue #2174566: HOT STABILITY: NPE in activity manager
Merge commit '2f2634e5be65c56f93d3fc3a97e25c546e3bc8bc'
* commit '2f2634e5be65c56f93d3fc3a97e25c546e3bc8bc':
Add group id to getThumbnail and cancelThumbnailRequest API.
Merge commit 'ed2247dc685233b82c7769a5e17f103c1c603ab9'
* commit 'ed2247dc685233b82c7769a5e17f103c1c603ab9':
Fix for bug 2158794. Hide MediaPlayer.invoke() and MediaPlayer.newRequest(), and Fix bad links in ToneGenerator documentation.
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 '6dc3f4e553d333b9f115a222a9a684bb2aa55b5e' into eclair-mr2
* commit '6dc3f4e553d333b9f115a222a9a684bb2aa55b5e':
Now that Eclair has been defined as API revision 5 mark Build.VERSION_CODES.ECLAIR as such.
Merge commit 'ee110be02256b816ac6d863e39cb8b11b8071baa' into eclair-mr2
* commit 'ee110be02256b816ac6d863e39cb8b11b8071baa':
Fix issue #2179891: Need to update 5.xml
Merge commit '2c6c5e6e49795e6e24cd089c9018377d837ba931' into eclair-mr2
* commit '2c6c5e6e49795e6e24cd089c9018377d837ba931':
Fix issue #2176944: Need API so browser, others can determine memory size of device
This is the main entry point to the Bluetooth APIs, and returns the default
local Bluetooth adapter.
It replaces context.getSystemService(Context.BLUETOOTH_SERVICE). This was
never in a public SDK release.
DrNo: eastham
Bug: 2158765
Joke: Why can't you play cards in the jungle? Because there's too many cheetas!
Change-Id: Ieed8be009ee5aba621cb69090ee8c8a9c19c840d
Merge commit 'dc2ccb82f96b6a7be7a7b262b81d3aa1422f46fa' into eclair-mr2
* commit 'dc2ccb82f96b6a7be7a7b262b81d3aa1422f46fa':
Encourage developers to connect RFCOMM by UUID instead of Channel.
Hide createRfcommSocket(int channel)
Add createRfcommSocketWithServiceRecord(UUID uuid)
Rename listenUsingRfcomm(String,UUID) -> listenUsingRfcommWithServiceRecord(..)
Now we have a complete API for developers to make peer-peer RFCOMM connections
with hard-coding the limited (30) RFCOMM channels, instead using SDP lookup
of an UUID.
This commit addresses two serious bugs:
- Do not throw IOException on accepting an incoming RFCOMM connection with
BluetoothSocket. This was a regression from commit 24bb9b8af4ff6915
- Workaround failure of bluez to update SDP cache when channel changes by
trying to use the same RFCOMM channel on the server every time, instead
of picking server channels randomly. This is a pretty ugly workaround,
and we are still trying to fix the caching issue - but with this
workaround we are at least shippable and apps will work at least until
they start colliding on the 30 RFCOMM channels.
DrNo: eastham
Bug: 2158900
Joke: What did the digital watch say to his mom? "Look mom no hands."
Change-Id: Ia4879943b83afac06b6f1a3f2391cf1628afce7d
