Merge commit '1d628c5d3dd7998b29c339292a2dc391015d0782' into kraken
* commit '1d628c5d3dd7998b29c339292a2dc391015d0782':
Accept media files by file extension in case insensitive manner.
This change includes work in progress on a C++ library for both host and device
MTP and PTP support.
Currently the makefile builds two test programs:
mtptest - a command line test program that implements a small subset of device side MTP.
Requires a kernel driver that has not been checked in yet.
ptptest - a host tool to test USB host support for detecting and communicating with
digital cameras over PTP. Runs on Linux host.
Later this will be reformulated as a native library that will be used in the media process.
Change-Id: I81aab279975b600b59d99013ab97f9adf0b58da7
Signed-off-by: Mike Lockwood <lockwood@android.com>
This code generates warnings when compiled with -Wformat-security,
and since it isn't being used, I figured it's better
to just delete it. As always, this code can be restored
by reverting this change.
Change-Id: I1da2049f41312b6eae5fa42892beb4a2036eb12f
Merge commit '28fadef2ede2d74e9526266e779553bbd1dc66f4' into kraken
* commit '28fadef2ede2d74e9526266e779553bbd1dc66f4':
Return a runtime error instead of asserting if the AACDecoder is passed an unsupported config.
Merge commit '3c78a1b58957e31d2991fb6a609abecbb1987b3b' into froyo-plus-aosp
* commit '3c78a1b58957e31d2991fb6a609abecbb1987b3b':
Return a runtime error instead of asserting if the AACDecoder is passed an unsupported config.
Merge commit 'bbafdc6403488b0f7ad564a5a0ff2eed5b87ab7b' into kraken
* commit 'bbafdc6403488b0f7ad564a5a0ff2eed5b87ab7b':
Don't clear the _data column in the audio_meta table, since it isn't
Merge commit 'b003ad17bffeba7875b9708ffeef2300ef28c916' into kraken
* commit 'b003ad17bffeba7875b9708ffeef2300ef28c916':
Support for customizable socket-read timeouts through the HTTP response.
Merge commit '227e443a43d70b9463b2e685688f73cfb1b72096' into kraken
* commit '227e443a43d70b9463b2e685688f73cfb1b72096':
Better seek handling and proper reset of the vorbis decoder after a discontinuity (seek)
Merge commit '0c73adb1dead4097b9c7dc04b8a547aaab817e85' into kraken
* commit '0c73adb1dead4097b9c7dc04b8a547aaab817e85':
Update javadoc in android.media.AudioManager to not hide the
Merge commit '836b2d75ef86487ecae0ae834ecbab324fd99471' into froyo-plus-aosp
* commit '836b2d75ef86487ecae0ae834ecbab324fd99471':
Don't clear the _data column in the audio_meta table, since it isn't
Merge commit 'e0dc80f878b56ed744bd06d341716fcfff4e3acc' into froyo-plus-aosp
* commit 'e0dc80f878b56ed744bd06d341716fcfff4e3acc':
Support for customizable socket-read timeouts through the HTTP response.
Merge commit 'd6ad7c85faf55fa8d0459f0fbc4fa32abdfefb6e' into froyo-plus-aosp
* commit 'd6ad7c85faf55fa8d0459f0fbc4fa32abdfefb6e':
Better seek handling and proper reset of the vorbis decoder after a discontinuity (seek)
Merge commit '3e90c76c12803cd1b116030fd124b7b870d25342' into froyo-plus-aosp
* commit '3e90c76c12803cd1b116030fd124b7b870d25342':
Update javadoc in android.media.AudioManager to not hide the
Specify a response header of "X-SocketTimeout: 15" to override the default timeout
of 5 secs with a timeout of 15 seconds. Specify a negative value to disable the
timeout altogether.
Change-Id: I545adf3d8b3f7efe5f8d081a641c6404440a77db
related-to-bug: 2675721
When the user selects a "Silent" notification sound, the Uri encoded
path is an empty string. Setting this Uri as the data source of the
MediaPlayer used to play notifications caused the completion listener
to not be called, which with the AudioFocus logic causes the Music
app to pause and never resume. The NotificationPlayer modifications
cause the MediaPlayer for the notification to only request audio
focus when the data source is not empty.
The audio focus code in AudioService is defensively synchronized
against a unique lock, and the exception observed in bug 2670395
is explicitely caught in case another edge case wasn't caught by
this fix.
The AudioFocus handling in AudioManager is modified so only the
requestAudioFocus and abandonAudioFocus methods are meant to be
used, as registerAudioFocusListener and unregisterAudioFocusListener
provided no additional functionality over the request/abandon
methods. abandonAudioFocus() also removes the listener from the
map in AudioManager since after abandonning focus, the listener
would no longer be called.
Change-Id: I3b553ee8a8163c25e01117d7e5479dd5fdfa7c6b
