resolve merge conflicts of ffe502b to cw-f-dev

am: 3dd656c624 Change-Id: I8217da44238234d4ba4c34ea76f5bd78fd7b87d2
2016-10-18 20:11:21 +00:00
parent f420816b25 3dd656c624
commit c6e0d5f125
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.
        }
    }
 }