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

Fix memory leak in Ringtone am: 76ed4ddca0

Browse Source 
am: 8d135d53cc

Change-Id: Ieed5a2e27ba53142ceb02a4e6812509beaabb414
This commit is contained in:
Erik Wolsheimer
2016-10-11 18:31:32 +00:00
committed by android-build-merger
parent 9011f8f926 8d135d53cc
commit fdc44dc732
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

@@ -371,6 +371,7 @@ public class Ringtone {
private void destroyLocalPlayer() {
if (mLocalPlayer != null) {
mLocalPlayer.setOnCompletionListener(null);
mLocalPlayer.reset();
mLocalPlayer.release();
mLocalPlayer = null;
@@ -467,11 +468,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);
}
}
}
}