summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorJonas Larsson <jonas@hallerud.se>2010-08-16 15:28:48 +0200
committerSteve Kondik <shade@chemlab.org>2010-08-16 17:30:14 -0400
commite61ca955e587702d960654fa28c056ee36a89b83 (patch)
tree23d8d49df3c5034f3a3ec122c37feb420cc3a2ac /media
parent55443cc86fb4bb16ab735fa94132039cf481b9d3 (diff)
downloadframeworks_base-e61ca955e587702d960654fa28c056ee36a89b83.zip
frameworks_base-e61ca955e587702d960654fa28c056ee36a89b83.tar.gz
frameworks_base-e61ca955e587702d960654fa28c056ee36a89b83.tar.bz2
Fix setStreamTyp not working
Breakage caused by previous commit. This also fixes the leakage that commit was intended to fix.
Diffstat (limited to 'media')
-rw-r--r--media/java/android/media/Ringtone.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/media/java/android/media/Ringtone.java b/media/java/android/media/Ringtone.java
index 0cecc3f..fdfa245 100644
--- a/media/java/android/media/Ringtone.java
+++ b/media/java/android/media/Ringtone.java
@@ -166,9 +166,7 @@ public class Ringtone {
}
private void openMediaPlayer() throws IOException {
- if (mAudio != null) {
- return;
- }
+ stop();
mAudio = new MediaPlayer();
if (mUri != null) {
mAudio.setDataSource(mContext, mUri);