diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-30 12:07:24 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-30 12:07:24 -0400 |
| commit | 6e58cf21088c2e6b0ef52572bfd544347e02fc17 (patch) | |
| tree | 4731ec220a751386391e0676f878a1a7881fd16e /core/java | |
| parent | fb54aaddf25c8b60e57239880663655ec76a1e8d (diff) | |
| parent | 020d2e3453b98ae435c4c21b849a2fe0a8842be7 (diff) | |
Merge change I020d2e34 into eclair
* changes:
Invoke the OnErrorListener callback when MediaPlayer.setDataSource() throws.
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/widget/VideoView.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/widget/VideoView.java b/core/java/android/widget/VideoView.java index 549f98420dc8..8142a823474e 100644 --- a/core/java/android/widget/VideoView.java +++ b/core/java/android/widget/VideoView.java @@ -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; } } |