summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2015-10-13 22:00:56 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-10-13 22:00:56 +0000
commit95c3a43ae474f327289670c8fc61a0ec003810af (patch)
treeec0798568d9bcb2feb5f56e000f0c885759b8cbe /media/libmediaplayerservice
parent106ceacb404fc580984f882a0c17d61aed3aaf7b (diff)
parentb345ddc3c728359166375af6f19367f547bbd613 (diff)
downloadframeworks_av-95c3a43ae474f327289670c8fc61a0ec003810af.zip
frameworks_av-95c3a43ae474f327289670c8fc61a0ec003810af.tar.gz
frameworks_av-95c3a43ae474f327289670c8fc61a0ec003810af.tar.bz2
Merge "Don't send OnCompletion events when looping" into mnc-dr-dev
Diffstat (limited to 'media/libmediaplayerservice')
-rw-r--r--media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
index 478d310..f288c36 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
@@ -747,7 +747,8 @@ void NuPlayerDriver::notifyListener_l(
// the last little bit of audio. If we're looping, we need to restart it.
mAudioSink->start();
}
- break;
+ // don't send completion event when looping
+ return;
}
mPlayer->pause();