Merge commit '328c0e7986aa6bb7752ec6de3da9c999920bb55f' into eclair-mr2-plus-aosp
* commit '328c0e7986aa6bb7752ec6de3da9c999920bb55f':
- removed the concept of Entity from the ContentProvider APIs
Merge commit 'b3c1f1cff4ecf5c88a0bd00d421beeb022bb41e4' into eclair-mr2-plus-aosp
* commit 'b3c1f1cff4ecf5c88a0bd00d421beeb022bb41e4':
move event log tags used by SyncAdapter into a local .logtags file
Merge commit '0f62abd986e1900ab4260e559b2dc7d917b6470f'
* commit '0f62abd986e1900ab4260e559b2dc7d917b6470f':
Fix#2313382: SECURITY: Live wallpapers get touch events through the lock screen.
Merge commit '274b8c584161342af2d1f6dc616995d98f6796ad'
* commit '274b8c584161342af2d1f6dc616995d98f6796ad':
Fix the build when ViewDebug.TRACE_RECYCLER is set to true.
Merge commit '9f4cea6846aa4ac2ec57c97f5da17822eb9b9727'
* commit '9f4cea6846aa4ac2ec57c97f5da17822eb9b9727':
Telephony: Make resetting radio on a radio technology change optional
Merge commit 'eb68a226563f60265663f1688dda77c4f909e5de'
* commit 'eb68a226563f60265663f1688dda77c4f909e5de':
Add bindService API to not bring ot foreground.
Merge commit '774568f73911ae2bb35c816a40d49376ea8300df'
* commit '774568f73911ae2bb35c816a40d49376ea8300df':
Close popup when Keyboard gets a CANCEL motion event.
Merge commit 'c97c5c0b9b61f48cbf47cb95d497e0bb6d01eeef'
* commit 'c97c5c0b9b61f48cbf47cb95d497e0bb6d01eeef':
Paper over 2275704 by not having LotsOfApps installed on the monkeys builds.
Merge commit '506afbd600d82a324f59ceb875f664ead4338600'
* commit '506afbd600d82a324f59ceb875f664ead4338600':
Remove the code where we suspect webkit draw during
Merge commit '5cd6fcd518d47d1974a10fccf3c3d5431a83307a'
* commit '5cd6fcd518d47d1974a10fccf3c3d5431a83307a':
Optional use of UTF-8 strings in resource bundles
Merge commit '8f4bca2acada86c36c7de59e8891ef120098aa19'
* commit '8f4bca2acada86c36c7de59e8891ef120098aa19':
Improve exception message thrown when a View's state is of the wrong type.
Merge commit '9f1ea0d47f5aa18cf949593e6bfd36af9c6a55be'
* commit '9f1ea0d47f5aa18cf949593e6bfd36af9c6a55be':
Some fixes for positioning the WebTextView.
Merge commit '30807a4500fab8b46ee661db2ba99286049a8adc'
* commit '30807a4500fab8b46ee661db2ba99286049a8adc':
Make sure to use the hand-tweaked-assembly version of the relevant mp3 code if building for ARM.
Merge commit 'b16cf676bd3304bc0c5da4210d689f4e680219b1'
* commit 'b16cf676bd3304bc0c5da4210d689f4e680219b1':
Fix the mp3 audio extractor that would occasionally return an invalid frame directly after a seek.
Merge commit 'a42b8f160fb5906638e978a470972d1f50d749ac'
* commit 'a42b8f160fb5906638e978a470972d1f50d749ac':
Minor tweaks to the mp3 and aac software decoders, propagate duration to output format.
Merge commit '42be7440ee2a3a360c83802e4e7a2ecf40220eff'
* commit '42be7440ee2a3a360c83802e4e7a2ecf40220eff':
Note to self: Don't reverse the arguments to fseek(o)...
Merge commit 'f43eeef301cb5a0c24c95ffa0425fcabda905b8d'
* commit 'f43eeef301cb5a0c24c95ffa0425fcabda905b8d':
Move the emergency call button to the top-right when there's no SIM.
Merge commit '45ccb6a55e0c3ec23a5bbf710d0d170bc39985ed'
* commit '45ccb6a55e0c3ec23a5bbf710d0d170bc39985ed':
Switching from activity based full screen plugins to a view system overlay.
Merge commit '15650af4ab1df7fb84839162f9409d88cb4a3ccc'
* commit '15650af4ab1df7fb84839162f9409d88cb4a3ccc':
Updating list of standard Intents in android.content.Intent
Merge commit '90073aadd5dfdbb0e7ca9b53ae086536f976793f'
* commit '90073aadd5dfdbb0e7ca9b53ae086536f976793f':
Document that some parameters will not be null and fix getSupportedPictureFormats.
Merge commit '20db86042618e6ef422e28a9e328336b98d526b7'
* commit '20db86042618e6ef422e28a9e328336b98d526b7':
GpsLocationProvider: Do not release wakelock until the GPS engine is fully off
Merge commit 'b9b45a5e26ed020a39a507a173d9f29e336cf989' into eclair-plus-aosp
* commit 'b9b45a5e26ed020a39a507a173d9f29e336cf989':
Adding screenshots for development/samples/Wiktionary and development/samples/WiktionarySimple.
Merge commit '159f0015418955501d8cf2744b0393db2e73f394' into eclair-mr2-plus-aosp
* commit '159f0015418955501d8cf2744b0393db2e73f394':
Allow resource and file URIs in ImageView.setImageURI()
Merge commit '45e77ce36ae1d26bcf35afb1f7662d7b6fb08212' into eclair-mr2-plus-aosp
* commit '45e77ce36ae1d26bcf35afb1f7662d7b6fb08212':
Use unbundled QSB for global search
Merge commit '14f8940472217e8b0164d8f213679710d623d528' into eclair-plus-aosp
* commit '14f8940472217e8b0164d8f213679710d623d528':
Fix media player decode function. Bug 2317821.
There was a recent change to OpenCORE that broke the MediaPlayer::decode()
function for all OpenCORE supported formats (MP3, AAC, and AMR-NB/WB). The
affect is that SoundPool is unreliable for all of these formats. This patch
changes the logic in the AudioCache object that processes messages from the
media player. The old logic was fragile. This change should make it more
robust against changes.
