commit 6f094510015ac608cfa287285fad7074de6dc51e
author Jean-Michel Trivi <jmtrivi@google.com> Mon Oct 08 21:36:29 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 08 21:36:29 2018 +0000
tree 9b830e40e10ceaf63a8d219b40d35fa18e9bffe9
parent 7c1aa36d1061aa6c1f1fd3ef9d75d25999666063
parent a8e45a978fb2a0305aa6712ffcb27475b8d0d07e

Merge "URIFD way causes leak in PlaybackActivityMonitor"

src/android/AudioPlayer_to_android.cpp

diff --git a/src/android/AudioPlayer_to_android.cpp b/src/android/AudioPlayer_to_android.cpp
index 23411b0..de27cae 100644
--- a/src/android/AudioPlayer_to_android.cpp
+++ b/src/android/AudioPlayer_to_android.cpp
@@ -1962,10 +1962,14 @@
     SL_LOGV("android_audioPlayer_destroy(%p)", pAudioPlayer);
     switch (pAudioPlayer->mAndroidObjType) {
 
-    case AUDIOPLAYER_FROM_PCM_BUFFERQUEUE: // intended fall-throughk, both types of players
-                                           //   use the TrackPlayerBase for playback
-        FALLTHROUGH_INTENDED;
     case AUDIOPLAYER_FROM_URIFD:
+        if (pAudioPlayer->mObject.mEngine->mAudioManager != 0) {
+            pAudioPlayer->mObject.mEngine->mAudioManager->releasePlayer(pAudioPlayer->mPIId);
+        }
+        // intended fall-throughk, both types of players
+        // use the TrackPlayerBase for playback
+        FALLTHROUGH_INTENDED;
+    case AUDIOPLAYER_FROM_PCM_BUFFERQUEUE:
         if (pAudioPlayer->mTrackPlayer != 0) {
             pAudioPlayer->mTrackPlayer->destroy();
         }