Merge commit 'def7db5b79e5c178834375020ef6b590e80af42f' into kraken
* commit 'def7db5b79e5c178834375020ef6b590e80af42f':
Fix issue 2592680: Saved ringer volume forced to 0 when receiving a call in silent mode.
Merge commit '834f0483ee7259f19e3f5d8e5c09ddcf875535b1' into kraken
* commit '834f0483ee7259f19e3f5d8e5c09ddcf875535b1':
Fix issue 2589563: Able to set ringer volume to 0 outside of silent mode.
Merge commit '6852b198fbedd9378ed79ca6528a4d6f33b0b677' into kraken
* commit '6852b198fbedd9378ed79ca6528a4d6f33b0b677':
Use PV_PLAYER to handle RTSP streaming
This is a regression introduced by change 5b4e654d0c7de8e4d58d73e73b0d5220f19b68f7 for issue 2472495.
When AudioService changes audio mode, setMode() reapplies current volume for the default active stream
which in this case is STREAM_RING.
Because the new implementation of silent mode actually mutes the ringer stream,
setStreamVolumeInt() now applies the volume change received while in silent mode
to the last audible value and we end up clearing the last audible volume for ringer.
The fix consists in not modifying last audible value when the new value is 0.
Also removed obsolete code in setStreamVolumeInt() since new implementation of setRingerModeInt()
in change 5b4e654d0c7de8e4d58d73e73b0d5220f19b68f7.
Change-Id: I746f3bc1af39a602ce12d130ce592007b2d0ebb6
The problem happens only if volume down key is pressed while
already in silent or vibrate mode. In this case, AudioService accepts
changing the last audible index for ringer volume from 1 to 0.
When volume up is pressed, current ringer volume value is restored from 0
instead of 1.
The fix consists in keeping last audible index at 1 once in silent of vibrate
mode even is volume down key is pressed.
Change-Id: Id08edd12ce985c22233124545eba2c3e4b8cdc8e
Merge commit '4f3257cf4667aa28908c401634db849fd2e516af' into kraken
* commit '4f3257cf4667aa28908c401634db849fd2e516af':
Snif more 3GPP file types according to http://www.ftyps.com/3gpp.html
Merge commit '30e9c2d4db145e02b5312ce29606b03dd78349d3' into kraken
* commit '30e9c2d4db145e02b5312ce29606b03dd78349d3':
Better diagnostics in the stagefright commandline tool, support for playing sine-tones using a filename of "sine:[samplingrate]", i.e. sine:44100. Support for playing audio through to the speakers by using "-o" in addition to "-a".
Merge commit '9bb8e65a7d7dc57fdd7383d64d53414b1aa5cbbc' into kraken
* commit '9bb8e65a7d7dc57fdd7383d64d53414b1aa5cbbc':
Don't set encoder component role while we query decoders
Merge commit '34b2ecc82aae3d317c2f4985049f68df3f8adbd7' into kraken
* commit '34b2ecc82aae3d317c2f4985049f68df3f8adbd7':
Fix bug 2578813 Delay pausing music and routing audio for car docks
Merge commit 'd4c072d3f584db2cf9214c9d813c15d9e646c527' into kraken
* commit 'd4c072d3f584db2cf9214c9d813c15d9e646c527':
Fix for 2581725. Keep the last frame after resume(), and delete it
Moved broadcast of ACTION_AUDIO_BECOMING_NOISY from BluetoothA2dpService
to AudioService.
Broadcast ACTION_AUDIO_BECOMING_NOISY when disconnecting an A2DP
device.
Disconnect from A2DP docks with a delay to handle transient
disconnections.
Cancel delayed A2DP disconnections when connecting to a dock as this
can be a reconnection after a transient disconnection.
Change-Id: I1ee9e99f3ffa20727af38a4c4c8711942894a696
Merge commit '248ea4a9f773210a7b7dbd7892e6b865a0f7add3' into kraken
* commit '248ea4a9f773210a7b7dbd7892e6b865a0f7add3':
Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don't have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks.
this is used in a few places to get access to the android.view.Surface
native surface. use a macro instead. Also rename the field to mNativeSurface.
Change-Id: I1c6dea14abd6b8b1392c7f97b304115999355094
Merge commit '98c5bd5556f32a237d3483fb7298284869e32a40' into kraken
* commit '98c5bd5556f32a237d3483fb7298284869e32a40':
Fix a race condition in TimedEventQueue, an event may be cancelled while we're waiting for its scheduled time to come in which case we'd be removing it from the queue twice.
