diff options
| author | Eric Laurent <elaurent@google.com> | 2015-08-18 00:59:51 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-18 00:59:51 +0000 |
| commit | c08872f977fc52c015cc17438dd3bd7981dfc0dc (patch) | |
| tree | c63af0b4fa9581ca578bca70dea437c01b26e755 /media/libmediaplayerservice | |
| parent | 39ff8149466ee8e86c0336f706cd4dd3713f359f (diff) | |
| parent | 97c9f4fd7bc31e2968d816402659ba1c64f10b42 (diff) | |
| download | frameworks_av-c08872f977fc52c015cc17438dd3bd7981dfc0dc.zip frameworks_av-c08872f977fc52c015cc17438dd3bd7981dfc0dc.tar.gz frameworks_av-c08872f977fc52c015cc17438dd3bd7981dfc0dc.tar.bz2 | |
Merge "NuPlayerRenderer: handle error when resuming an offloaded track" into mnc-dev
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(); + } } { |