Merge commit '8bbba0e35b0dd5191c94b2aa039aa4eae0aecad0' into eclair-plus-aosp
* commit '8bbba0e35b0dd5191c94b2aa039aa4eae0aecad0':
Dont NPE if the thumbnail file cannot be opened.
* changes:
Fix some metadata retriever issues: 1. mRetriever was initialized twice: one in the constructor and the other in the setDataSource 2. cached the mode so that setMode can still be called before setDataSource. mRetriever won't be initialized until data source is set; thus we have to do this
1. mRetriever was initialized twice: one in the constructor and the other in the setDataSource
2. cached the mode so that setMode can still be called before setDataSource.
mRetriever won't be initialized until data source is set; thus we have to do this
Merge commit '9365c8fa7c66c62de98b859f08c881ea2ad65980'
* commit '9365c8fa7c66c62de98b859f08c881ea2ad65980':
Turn on thubmnail capture unit test for media metadata retriever
Merge commit '99638e747251929191f7773d2a81bbea223f1e09' into eclair-plus-aosp
* commit '99638e747251929191f7773d2a81bbea223f1e09':
Turn on thubmnail capture unit test for media metadata retriever
Merge commit '14e8e988cfdd01b665f5b49fb6f95a6c11ce3660'
* commit '14e8e988cfdd01b665f5b49fb6f95a6c11ce3660':
Always consider m4a files as audio, even when they contain a video track.
Merge commit 'aa507136493b24a899b270367b08a7158085c9b8'
* commit 'aa507136493b24a899b270367b08a7158085c9b8':
Check that playlist entries refer to a row in the audio table.
Merge commit '7d9735142f75c3bf30b420fdd006dc356f32fede' into eclair-plus-aosp
* commit '7d9735142f75c3bf30b420fdd006dc356f32fede':
Always consider m4a files as audio, even when they contain a video track.
Merge commit 'c46f886b63772be33c6e6864475140606a79e126'
* commit 'c46f886b63772be33c6e6864475140606a79e126':
Only scan windows media files when those codecs are enabled.
Merge commit 'dba93b68326f139f669aefa6770d50daff032746' into eclair-plus-aosp
* commit 'dba93b68326f139f669aefa6770d50daff032746':
Check that playlist entries refer to a row in the audio table.
Merge commit 'cc96652c7049569c1bc7b1f93ba454a7cb891fd8' into eclair-plus-aosp
* commit 'cc96652c7049569c1bc7b1f93ba454a7cb891fd8':
Remove fflush when storing thumbanil to sdcard.
Merge commit '0faa5c6c5a6da598fd6cdac3a5c1f1f9a2090ad2' into eclair-plus-aosp
* commit '0faa5c6c5a6da598fd6cdac3a5c1f1f9a2090ad2':
Only scan windows media files when those codecs are enabled.
Merge commit '7756cbeef475127ed56bfeabecb3c291366a952f' into eclair-plus-aosp
* commit '7756cbeef475127ed56bfeabecb3c291366a952f':
Removed the device type checking
Merge commit 'df9879bf1fb8c9785b20bc3fbe0b2ad6e4f09dfd'
* commit 'df9879bf1fb8c9785b20bc3fbe0b2ad6e4f09dfd':
Fix issue 2142613: ToneGenerator: short tones sometimes don't play on sholes or over A2DP.
Merge commit '384350e8043b02e332ad4bea0a0c1e9b26f2e1bb'
* commit '384350e8043b02e332ad4bea0a0c1e9b26f2e1bb':
Added the checking for the wma in the memory test.
Merge commit 'd503453ca093a1aac3781cdf6d86fd0700de6600'
* commit 'd503453ca093a1aac3781cdf6d86fd0700de6600':
Fix issue 2128896 The thumbnail generated after picture capture with max zoom is overlapped with previous thumbnail.
Merge commit '99c156cd9ff67119e20d4ebc851998d68492da05'
* commit '99c156cd9ff67119e20d4ebc851998d68492da05':
Suppress the testPing as we moved the release test target to the userdebug. This test rely on a mock_media_player.so which build under the eng build
Merge commit 'e9bd4788d4370714374d833aed1339d17c5ded09' into eclair-plus-aosp
* commit 'e9bd4788d4370714374d833aed1339d17c5ded09':
Fix issue 2142613: ToneGenerator: short tones sometimes don't play on sholes or over A2DP.
Merge commit '3f790d87838114a71bff96b4a0a51537ca879597' into eclair-plus-aosp
* commit '3f790d87838114a71bff96b4a0a51537ca879597':
Added the checking for the wma in the memory test.
When the AudioTrack callback notification size is relatively high (Which is the case on Sholes and over A2DP), it is likely that the end of tone is reached during the first callback. In this case, the AudioTrack is stopped before exiting the callback which causes 2 problems:
- 1: If the AudioFlinger thread is scheduled before we exit the ToneGenerator callback, the track can be stopped and reset before the data is actually marked as present in the buffer by the AudioTrack callback => no audio will be processed by AudioFlinger.
- 2: In this case, the data write index in the AudioTrack buffer is incremented after the track was reset by the AudioFlinger which leaves unplayed data in the buffer. This data will be played the next time the AudioTrack is started if not flushed in between.
The fix consists in adding an intermediate state to ToneGenerator state machine so that we exit the callback function when the stop condition is reached and stop the AudioTrack the next time we execute the callback.
Merge commit '80d8ace484525f0272b8a56142ef838f5f4d38e4' into eclair-plus-aosp
* commit '80d8ace484525f0272b8a56142ef838f5f4d38e4':
Fix issue 2128896 The thumbnail generated after picture capture with max zoom is overlapped with previous thumbnail.
Merge commit '7d0bdfaf9adbdaee0b8979d3d23b5b7ecb8a90a9' into eclair-plus-aosp
* commit '7d0bdfaf9adbdaee0b8979d3d23b5b7ecb8a90a9':
Suppress the testPing as we moved the release test target to the userdebug. This test rely on a mock_media_player.so which build under the eng build
* changes:
Suppress the testPing as we moved the release test target to the userdebug. This test rely on a mock_media_player.so which build under the eng build
