commit 6fb19507d4b4f27ea7a74b978cf07142e64a9353
author Marco Nelissen <marcone@google.com> Thu Oct 07 12:19:26 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 07 12:19:26 2010 -0700
tree 5e7539984b1fbe54183f14e7c709b1cc08066830
parent 1f012b14fa9577ac1d55748496d0f4461854c75e
parent 017a9e988b64bdaceda12421937c7d09a18d0084

am 017a9e98: am 32905800: Also show the error Toast in the preview activity when playback fails.

Merge commit '017a9e988b64bdaceda12421937c7d09a18d0084'

* commit '017a9e988b64bdaceda12421937c7d09a18d0084':
  Also show the error Toast in the preview activity when playback fails.

src/com/android/music/AudioPreview.java

diff --git a/src/com/android/music/AudioPreview.java b/src/com/android/music/AudioPreview.java
index 22c9c7d..b7d1533 100644
--- a/src/com/android/music/AudioPreview.java
+++ b/src/com/android/music/AudioPreview.java
@@ -46,6 +46,7 @@
 import android.widget.SeekBar;
 import android.widget.TextView;
 import android.widget.SeekBar.OnSeekBarChangeListener;
+import android.widget.Toast;
 
 import java.io.IOException;
 
@@ -315,6 +316,7 @@
     };
 
     public boolean onError(MediaPlayer mp, int what, int extra) {
+        Toast.makeText(this, R.string.playback_failed, Toast.LENGTH_SHORT).show();
         finish();
         return true;
     }