Merge commit '4e60d7e60b29c42c6745dd23ff90dced8834fa7c' into eclair-plus-aosp
* commit '4e60d7e60b29c42c6745dd23ff90dced8834fa7c':
Support encoding amr-wb content in stagefright.
Merge commit '100f08613392c225b8dff3f1e1d586f981884e29' into eclair-plus-aosp
* commit '100f08613392c225b8dff3f1e1d586f981884e29':
Query for all properties if a property change is received and cache is empty.
Merge commit 'cf7b5521fc4a8f87033e3bf3626e8a2cf81fccfd' into eclair-plus-aosp
* commit 'cf7b5521fc4a8f87033e3bf3626e8a2cf81fccfd':
Remove the call to nativeAddJavascriptInterface() from BrowserFrame::addJavascriptInterface() as it causes an intermitent crash.
Merge commit 'ccda4c4960ad6694e506e075f8f0b479ea2bafb6' into eclair-plus-aosp
* commit 'ccda4c4960ad6694e506e075f8f0b479ea2bafb6':
Do not cache POST response as Cache is indexed with url.
Appears to have been broken by:
commit 9779b221e999583ff89e0dfc40e56398737adbb3
Author: Mathias Agopian <mathias@google.com>
Date: Mon Sep 7 16:32:45 2009 -0700
fix [2068105] implement queueBuffer/lockBuffer/dequeueBuffer properly
For some reason we don't like to have "-lpthread" globally -- it's a no-op
on device builds, but required for many host tools and all sim binaries --
so adding the use of pthread calls requires adding the library explicitly.
Merge commit '11c803ac77b6a9b815180b4649a700361d3b8cfe' into eclair-plus-aosp
* commit '11c803ac77b6a9b815180b4649a700361d3b8cfe':
use broadcast() instead of signal() when signaling the condition-variable Thread::RequestExitAndWait() is waiting for
Merge commit '72e2d6da79a2fc3b5346c02ed40b9335c1eb78fa' into eclair-plus-aosp
* commit '72e2d6da79a2fc3b5346c02ed40b9335c1eb78fa':
fix [2037525] Fail to start camera after adb sync new Camera
Merge commit '0a5bf25765cc884aba8d417d8a85f985c5ff3b5a' into eclair-plus-aosp
* commit '0a5bf25765cc884aba8d417d8a85f985c5ff3b5a':
rename Mutexes to make the code easier to follow
we could have several thread waiting on the condition and they all need to wake-up.
also added a debug "mTid" field in the class, which contains the tid of the thread (as opposed to pthread_t), this
is useful when debugging under gdb for instance.
we ended-up locking a Mutex that had been destroyed.
This happened because we gave an sp<Source> to the outside world,
and were called after LayerBuffer had been destroyed.
Instead we now give a wp<LayerBuffer> to the outside and have it
do the destruction.
Merge commit '0c065d9ef17ad9e045391bab3630a49fb998250c' into eclair-plus-aosp
* commit '0c065d9ef17ad9e045391bab3630a49fb998250c':
Replace the delimiter whitespace with '\0'.
+ Use '\0' as the delimiter.
+ Allow whitespace character for keystore password.
In previous implementation, we use space as the delimiter. That
will stop user from using passphrase with whitespace character.
Merge commit '997eddb0a0a069ea627e8b07d41d7ffdbc12c53d' into eclair-plus-aosp
* commit '997eddb0a0a069ea627e8b07d41d7ffdbc12c53d':
Avoid CDMA messages with IDs of zero.
Add a parameter to ToneGenerator.startTone() allowing the caller to specify the tone duration. This is used by the phone application to have a precise control on the DTMF tone duration which was not possible with the use of delayed messaged.
Also modified AudioFlinger output threads so that 0s are written to the audio output stream when no more tracks are ready to mix instead of just sleeping. This avoids an issue where the end of a previous DTMF tone could stay in audio hardware buffers and be played just before the beginning of the next DTMF tone.
Merge commit '0a46e91357def02cbc6a5449c86763f4350850db' into eclair-plus-aosp
* commit '0a46e91357def02cbc6a5449c86763f4350850db':
Fix broken GSM SMS unit test, and general cleanup.
Merge commit '046263ce352912990e492eb5cfd833c21109cf9f' into eclair-plus-aosp
* commit '046263ce352912990e492eb5cfd833c21109cf9f':
Import revised translations. DO NOT MERGE
* changes:
new file: LowStorageTest/Android.mk new file: LowStorageTest/AndroidManifest.xml new file: LowStorageTest/res/layout/main.xml new file: LowStorageTest/res/values/strings.xml new file: LowStorageTest/src/com/android/lowstoragetest/LowStorageTest.java Add the test app which can eat up 100% of the data parition. This is for the low storage test.
Merge commit 'e989496e2bb7a64abe7336db1e728095ebc83a0c' into eclair-plus-aosp
* commit 'e989496e2bb7a64abe7336db1e728095ebc83a0c':
Make the hardkeyboard long press dialog look the same as that of soft keyboard.
Merge commit 'b752098e8d12d6e7925d97458078dbb896ca8a05' into eclair-plus-aosp
* commit 'b752098e8d12d6e7925d97458078dbb896ca8a05':
Sync status was ignoring account - the new UI has specific sync status for each account, so we need to use it.
Merge commit '33b69050b2074c1768c45895418f0454e52e279a' into eclair-plus-aosp
* commit '33b69050b2074c1768c45895418f0454e52e279a':
Add javadoc to explain which permissions are required for Public BT API's.
Merge commit 'e0f64aae8c02088be1c67bd97afc495e9098561c' into eclair-plus-aosp
* commit 'e0f64aae8c02088be1c67bd97afc495e9098561c':
The qcom decoder requires that the output buffers be allocated by the component for hardware accelerated display to work.
Merge commit 'c3a30a00333910268e2b93c58f14214b074aa929' into eclair-plus-aosp
* commit 'c3a30a00333910268e2b93c58f14214b074aa929':
adding support for webkit plugins to use the java view system
Merge commit 'e05e02e17463616c885784a1f0e57eeb22b13f93' into eclair-plus-aosp
* commit 'e05e02e17463616c885784a1f0e57eeb22b13f93':
Add basic metadata retrieval support for midi, ogg, etc.
Merge commit 'c18e9ed39c7cf68c1d946ef7c8533a3156181f86' into eclair-plus-aosp
* commit 'c18e9ed39c7cf68c1d946ef7c8533a3156181f86':
don't fling if there's nowhere to go
Merge commit 'f8d4964e45f7e671f4b333386b4269b23ced4750' into eclair-plus-aosp
* commit 'f8d4964e45f7e671f4b333386b4269b23ced4750':
default overview mode to false in webkit
