Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix memory leak in Ringtone

Browse Source 
BUG: 31938615
Change-Id: Ic736f3494b4da95460bdc0cb7857cc9fcc746ab9
This commit is contained in:
Erik Wolsheimer
2016-10-11 10:13:23 -07:00
parent 15ece4787e
commit 76ed4ddca0
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
media/java/android/media/Ringtone.java
View File

@@ -368,6 +368,7 @@ public class Ringtone {
private void destroyLocalPlayer() { private void destroyLocalPlayer() {
if (mLocalPlayer != null) { if (mLocalPlayer != null) {
mLocalPlayer.setOnCompletionListener(null);
mLocalPlayer.reset(); mLocalPlayer.reset();
mLocalPlayer.release(); mLocalPlayer.release();
mLocalPlayer = null; mLocalPlayer = null;
@@ -464,11 +465,14 @@ public class Ringtone {
} }
class MyOnCompletionListener implements MediaPlayer.OnCompletionListener { class MyOnCompletionListener implements MediaPlayer.OnCompletionListener {
public void onCompletion(MediaPlayer mp) @Override
{ public void onCompletion(MediaPlayer mp) {
synchronized (sActiveRingtones) { synchronized (sActiveRingtones) {
sActiveRingtones.remove(Ringtone.this); sActiveRingtones.remove(Ringtone.this);
} }
if (mLocalPlayer != null) {
mLocalPlayer.setOnCompletionListener(null);
}
} }
} }
} }