commit ffe502bd61ebe78c2f580c1486021dc116a08f94
author Andy Hung <hunga@google.com> Mon Oct 17 18:02:29 2016 -0700
committer Andy Hung <hunga@google.com> Mon Oct 17 18:12:35 2016 -0700
tree d31f3721c831fc0614ae88612d9bcba18077e0b3
parent 6aa197116e0f0b380a9aaafaef70a07e5cbe5dff

Ringtone: clear the MediaPlayer listener upon completion

This breaks a local refcount cycle and allows the Java gc to finalize
the Ringtone and MediaPlayer objects quickly.

Bug: 31811091
Change-Id: I0e5a4a78fdc02cc0c8b7811a1f1a45db3c90a0ff

media/java/android/media/Ringtone.java

diff --git a/media/java/android/media/Ringtone.java b/media/java/android/media/Ringtone.java
index c2bcd93..79412d4 100644
--- a/media/java/android/media/Ringtone.java
+++ b/media/java/android/media/Ringtone.java
@@ -469,6 +469,7 @@
             synchronized (sActiveRingtones) {
                 sActiveRingtones.remove(Ringtone.this);
             }
+            mp.setOnCompletionListener(null); // Help the Java GC: break the refcount cycle.
         }
     }
 }