am 6e58cf21: Merge change I020d2e34 into eclair

Merge commit '6e58cf21088c2e6b0ef52572bfd544347e02fc17' into eclair-plus-aosp

* commit '6e58cf21088c2e6b0ef52572bfd544347e02fc17':
  Invoke the OnErrorListener callback when MediaPlayer.setDataSource() throws.
This commit is contained in:
Andrei Popescu
2009-09-30 09:13:33 -07:00
committed by Android Git Automerger

View File

@@ -222,11 +222,13 @@ public class VideoView extends SurfaceView implements MediaPlayerControl {
Log.w(TAG, "Unable to open content: " + mUri, ex);
mCurrentState = STATE_ERROR;
mTargetState = STATE_ERROR;
mErrorListener.onError(mMediaPlayer, MediaPlayer.MEDIA_ERROR_UNKNOWN, 0);
return;
} catch (IllegalArgumentException ex) {
Log.w(TAG, "Unable to open content: " + mUri, ex);
mCurrentState = STATE_ERROR;
mTargetState = STATE_ERROR;
mErrorListener.onError(mMediaPlayer, MediaPlayer.MEDIA_ERROR_UNKNOWN, 0);
return;
}
}