Merge "Release MediaPlayer before letting it go out of scope."

marcone · Android (Google) Code Review · commit d94a7b60ccbd · 2011-09-29T10:11:34.000-07:00
diff --git a/media/java/android/media/Ringtone.java b/media/java/android/media/Ringtone.java
@@ -166,6 +166,9 @@ private static String getTitle(Context context, Uri uri, boolean followSettingsU
     }
     
     private void openMediaPlayer() throws IOException {
+        if (mAudio != null) {
+            mAudio.release();
+        }
         mAudio = new MediaPlayer();
         if (mUri != null) {
             mAudio.setDataSource(mContext, mUri);

Original file line number	Diff line number	Diff line change
`@@ -166,6 +166,9 @@ private static String getTitle(Context context, Uri uri, boolean followSettingsU`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`private void openMediaPlayer() throws IOException {`
	`169`	`+ if (mAudio != null) {`
	`170`	`+ mAudio.release();`
	`171`	`+ }`
`169`	`172`	`mAudio = new MediaPlayer();`
`170`	`173`	`if (mUri != null) {`
`171`	`174`	`mAudio.setDataSource(mContext, mUri);`