diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-20 11:43:50 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-20 11:43:50 -0700 |
| commit | 79e338fb2ae4144a7069e9b3ce4c6d7a2b7b87ec (patch) | |
| tree | 936f732b74bb8b8e36841a3d711abec00614078c | |
| parent | 60662b035c0ac0dd3b67d1bbdb54e1b6ba139148 (diff) | |
| parent | d44d33b01a2125cfa40153e8399dd39908005004 (diff) | |
| download | frameworks_base-79e338fb2ae4144a7069e9b3ce4c6d7a2b7b87ec.zip frameworks_base-79e338fb2ae4144a7069e9b3ce4c6d7a2b7b87ec.tar.gz frameworks_base-79e338fb2ae4144a7069e9b3ce4c6d7a2b7b87ec.tar.bz2 | |
Merge change 22089 into eclair
* changes:
The MetaData API is optional and getMetadata may return null if unsupported.
| -rw-r--r-- | core/java/android/widget/VideoView.java | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/core/java/android/widget/VideoView.java b/core/java/android/widget/VideoView.java index e60ff25..549f984 100644 --- a/core/java/android/widget/VideoView.java +++ b/core/java/android/widget/VideoView.java @@ -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); - 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); + + 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); |