diff options
| author | Eric Laurent <elaurent@google.com> | 2015-08-18 01:06:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-18 01:06:43 +0000 |
| commit | dd6a17649106fd48b0e69703d339bbc5a1ae9a0b (patch) | |
| tree | 7f027f1a0e8ec2bec1834c446a0fb1713dd6d078 /media/libmediaplayerservice | |
| parent | 3264b251353c37d7efc8ffb6e420dd71b6b62349 (diff) | |
| parent | c08872f977fc52c015cc17438dd3bd7981dfc0dc (diff) | |
| download | frameworks_av-dd6a17649106fd48b0e69703d339bbc5a1ae9a0b.zip frameworks_av-dd6a17649106fd48b0e69703d339bbc5a1ae9a0b.tar.gz frameworks_av-dd6a17649106fd48b0e69703d339bbc5a1ae9a0b.tar.bz2 | |
am c08872f9: Merge "NuPlayerRenderer: handle error when resuming an offloaded track" into mnc-dev
* commit 'c08872f977fc52c015cc17438dd3bd7981dfc0dc':
NuPlayerRenderer: handle error when resuming an offloaded track
Diffstat (limited to 'media/libmediaplayerservice')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp index 2e0d0d3..04a46f4 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp @@ -1469,7 +1469,10 @@ void NuPlayer::Renderer::onResume() { if (mHasAudio) { cancelAudioOffloadPauseTimeout(); - mAudioSink->start(); + status_t err = mAudioSink->start(); + if (err != OK) { + notifyAudioTearDown(); + } } { |