Merge "Fix memory leak in Ringtone" into cw-f-dev (7777b3d1) · Commits · e / os / android_frameworks_base

media/java/android/media/Ringtone.java

+6 −2

Original line number	Diff line number	Diff line
		@@ -368,6 +368,7 @@ public class Ringtone {

		private void destroyLocalPlayer() {
		if (mLocalPlayer != null) {
		mLocalPlayer.setOnCompletionListener(null);
		mLocalPlayer.reset();
		mLocalPlayer.release();
		mLocalPlayer = null;
		@@ -464,11 +465,14 @@ public class Ringtone {
		}

		class MyOnCompletionListener implements MediaPlayer.OnCompletionListener {
		public void onCompletion(MediaPlayer mp)
		{
		@Override
		public void onCompletion(MediaPlayer mp) {
		synchronized (sActiveRingtones) {
		sActiveRingtones.remove(Ringtone.this);
		}
		if (mLocalPlayer != null) {
		mLocalPlayer.setOnCompletionListener(null);
		}
		}
		}
		}