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

Commit 3dd656c6 authored by Andy Hung's avatar Andy Hung
Browse files

resolve merge conflicts of ffe502bd to cw-f-dev 

Change-Id: Id392b2e1990dc50b5d2d552f283a11a648d849a1
parents cbec3361 ffe502bd

media/java/android/media/Ringtone.java

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

        }

    }

}