Merge commit '91800118a129bd63fc19e90da6b52c67036fa424'
* commit '91800118a129bd63fc19e90da6b52c67036fa424':
- don't schedule syncs that we will never dispatch
Merge commit 'f7d1c27327b6832ce97f233f27b2927a05f8b387'
* commit 'f7d1c27327b6832ce97f233f27b2927a05f8b387':
Set RFCOMM SO_SNDBUF size to 70 KB for large RFCOMM writes.
Merge commit '81608741dc26da8ce6ddfe4a86fa1b956cb6406b'
* commit '81608741dc26da8ce6ddfe4a86fa1b956cb6406b':
Add a synchronous stop method to TTS synth engine so that upon its destruction,
Merge commit '18ab96294f0842570f608e692dc3c88ce289df4f'
* commit '18ab96294f0842570f608e692dc3c88ce289df4f':
Set result code in REMOTE_INTENT receiver for subscribed feeds.
Merge commit '90fa99b14f84724a7beae8dd9b1870b173ec43ef'
* commit '90fa99b14f84724a7beae8dd9b1870b173ec43ef':
Fix issue 2085690: AudioFlinger must properly terminate the input and output threads when destroyed.
Merge commit 'e266995bb15914b2e648901b379460953a1ff73b'
* commit 'e266995bb15914b2e648901b379460953a1ff73b':
Adding a column to Contacts, which will be used as an additional "soft" identity.
Merge commit 'cedcb13547d3c65091ca12b1f69be563af442eb1' into eclair-plus-aosp
* commit 'cedcb13547d3c65091ca12b1f69be563af442eb1':
Use Email.TYPE_MOBILE
Merge commit '7cb08accdd923e05518f4bacd103bfe68d589e5d' into eclair-plus-aosp
* commit '7cb08accdd923e05518f4bacd103bfe68d589e5d':
- don't schedule syncs that we will never dispatch
Merge commit '3e59cf7ede6d6c66cbb0b1e1f345cf132972a713' into eclair-plus-aosp
* commit '3e59cf7ede6d6c66cbb0b1e1f345cf132972a713':
Set RFCOMM SO_SNDBUF size to 70 KB for large RFCOMM writes.
Merge commit '550d48f3342f01ccf6c310845e8c0b986ab7b506' into eclair-plus-aosp
* commit '550d48f3342f01ccf6c310845e8c0b986ab7b506':
Add a synchronous stop method to TTS synth engine so that upon its destruction,
* changes:
Add a synchronous stop method to TTS synth engine so that upon its destruction, if it was synthesing to a file, the latter can be deleted without still being written to. Clear the hashmap of SpeechItem to be stopped (mKillList) when the speech queue is empty.
Merge commit '9399a3de6acb6e598fdceae2684ff9bb9d8c1050' into eclair-plus-aosp
* commit '9399a3de6acb6e598fdceae2684ff9bb9d8c1050':
Set result code in REMOTE_INTENT receiver for subscribed feeds.
With a 64 KB OBEX MTU, net/rfcomm/sock.c:rfcomm_sock_sendmsg() quietly drops data.
The default SO_SNDBUF is 24 KB. Empircally, 36 KB still drops, and 38 KB no longer drops (this is because SO_SNDBUF is doubled in net/core/sock.c and then there is OBEX/RFCOMM overhead). Set to 70 KB so we have plenty of room to spare.
See http://b/2090000 to investigate this in more detail later.
* changes:
modified: res/layout/surface_view.xml modified: src/com/android/mediaframeworktest/MediaFrameworkTest.java modified: src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java Fixed the async mp3 playback test case and also switch the base activity to full screen.
modified: src/com/android/mediaframeworktest/MediaFrameworkTest.java
modified: src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
Fixed the async mp3 playback test case and also switch the base activity to full screen.
modified: src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
modified: tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
modified: tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
if it was synthesing to a file, the latter can be deleted without
still being written to.
Clear the hashmap of SpeechItem to be stopped (mKillList) when the speech
queue is empty.
Merge commit 'f7c7a67d9b223f92e1884a82d49714cb71ee7d37' into eclair-plus-aosp
* commit 'f7c7a67d9b223f92e1884a82d49714cb71ee7d37':
Fix issue 2085690: AudioFlinger must properly terminate the input and output threads when destroyed.
Merge commit 'f35bce45058200ff1209385e63e34fbf59255db6' into eclair-plus-aosp
* commit 'f35bce45058200ff1209385e63e34fbf59255db6':
Adding a column to Contacts, which will be used as an additional "soft" identity.
The main consumer of this feature is shortcuts.
The LOOKUP KEY column will contain an encoded concatenation of the contact's row id
as well as sync_ids of all constituent raw contacts. It goes with the "contacts/lookup/*/#" URI.
When we get such a URI, we will first try to load the
contact with the specified _id and lookup_key. If we cannot find the contact
that way, we will go scout for the contact that contains most of the sync_ids
we found in the lookup key.
We will need to make sure that the contact picker returns the lookup-style URIs.
Merge commit '46588ef200aec0f6dbc7c07b132d002039fbd45e'
* commit '46588ef200aec0f6dbc7c07b132d002039fbd45e':
disable canceling until the http connection code is understood
Merge commit '66360af891ac1b77fa5a48d668bd848c84b6f041' into eclair-plus-aosp
* commit '66360af891ac1b77fa5a48d668bd848c84b6f041':
disable canceling until the http connection code is understood
Merge commit '71137e6b7ac5d96482f5d038a60aa4ebef01ff3f'
* commit '71137e6b7ac5d96482f5d038a60aa4ebef01ff3f':
Add a flag (-G) to aapt to have it output the classes that shouldn't be obfuscated by ProGuard.
