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

Commit 79e338fb authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 22089 into eclair 

* changes:
  The MetaData API is optional and getMetadata may return null if unsupported.
parents 60662b03 d44d33b0

core/java/android/widget/VideoView.java

+11 −6
Original line number Diff line number Diff line
@@ -267,12 +267,17 @@ public class VideoView extends SurfaceView implements MediaPlayerControl { 
            // Get the capabilities of the player for this stream

            Metadata data = mp.getMetadata(MediaPlayer.METADATA_ALL,

                                      MediaPlayer.BYPASS_METADATA_FILTER);



            if (data != null) {

                mCanPause = !data.has(Metadata.PAUSE_AVAILABLE)

                        || data.getBoolean(Metadata.PAUSE_AVAILABLE);

                mCanSeekBack = !data.has(Metadata.SEEK_BACKWARD_AVAILABLE)

                        || data.getBoolean(Metadata.SEEK_BACKWARD_AVAILABLE);

                mCanSeekForward = !data.has(Metadata.SEEK_FORWARD_AVAILABLE)

                        || data.getBoolean(Metadata.SEEK_FORWARD_AVAILABLE);

            } else {

                mCanPause = mCanSeekForward = mCanSeekForward = true;

            }



            if (mOnPreparedListener != null) {

                mOnPreparedListener.onPrepared(mMediaPlayer);