Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e58cf21 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change I020d2e34 into eclair 

* changes:
  Invoke the OnErrorListener callback when MediaPlayer.setDataSource() throws.
parents fb54aadd 020d2e34

core/java/android/widget/VideoView.java

+2 −0
Original line number Diff line number Diff line
@@ -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;

        }

    }