resolve merge conflicts of ffe502b to cw-f-dev

Change-Id: Id392b2e1990dc50b5d2d552f283a11a648d849a1
2016-10-18 11:55:04 -07:00
parent cbec33614a ffe502bd61
commit 3dd656c624
1 changed files with 1 additions and 3 deletions
--- a/media/java/android/media/Ringtone.java
+++ b/media/java/android/media/Ringtone.java
@@ -470,9 +470,7 @@ public class Ringtone {
            synchronized (sActiveRingtones) {
                sActiveRingtones.remove(Ringtone.this);
            }
-            if (mLocalPlayer != null) {
-                mLocalPlayer.setOnCompletionListener(null);
-            }
+            mp.setOnCompletionListener(null); // Help the Java GC: break the refcount cycle.
        }
    }
 }