commit 8d135d53ccaa0545b0d15ffd13edfda3577e8d38
author Erik Wolsheimer <ewol@google.com> Tue Oct 11 18:25:39 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Oct 11 18:25:39 2016 +0000
tree 3acce333c4fd9bd54c92c9c1f70841d8c7c80ac6
parent 3d7e40f612254e3857a155c2c45fc98fa5ac8f36
parent 76ed4ddca01ced8ae8eec3255b72b5d9741930a5

Fix memory leak in Ringtone
am: 76ed4ddca0

Change-Id: I7c1167593ba2cc960dbb0b57385c574f5c22f2ad

media/java/android/media/Ringtone.java

diff --git a/media/java/android/media/Ringtone.java b/media/java/android/media/Ringtone.java
index c2bcd93..6658e88 100644
--- a/media/java/android/media/Ringtone.java
+++ b/media/java/android/media/Ringtone.java
@@ -368,6 +368,7 @@
 
     private void destroyLocalPlayer() {
         if (mLocalPlayer != null) {
+            mLocalPlayer.setOnCompletionListener(null);
             mLocalPlayer.reset();
             mLocalPlayer.release();
             mLocalPlayer = null;
@@ -464,11 +465,14 @@
     }
 
     class MyOnCompletionListener implements MediaPlayer.OnCompletionListener {
-        public void onCompletion(MediaPlayer mp)
-        {
+        @Override
+        public void onCompletion(MediaPlayer mp) {
             synchronized (sActiveRingtones) {
                 sActiveRingtones.remove(Ringtone.this);
             }
+            if (mLocalPlayer != null) {
+                mLocalPlayer.setOnCompletionListener(null);
+            }
         }
     }
 }