Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0564ec9d authored by Andy Hung's avatar Andy Hung Committed by android-build-merger
Browse files

resolve merge conflicts of ffe502bd to cw-f-dev am: 3dd656c6 

am: c6e0d5f1

Change-Id: I80b908142bb4dbd2af8c9f3627ecfd5e3df1963c
parents 1262a92a c6e0d5f1

media/java/android/media/Ringtone.java

+1 −3
Original line number Diff line number Diff line
@@ -473,9 +473,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.

        }

    }

}