Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 22089 into eclair

Browse Source 
* changes:
  The MetaData API is optional and getMetadata may return null if unsupported.
This commit is contained in:
Android (Google) Code Review
2009-08-20 11:43:50 -07:00
parent 60662b035c d44d33b01a
commit 79e338fb2a
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/java/android/widget/VideoView.java
View File

@@ -267,12 +267,17 @@ public class VideoView extends SurfaceView implements MediaPlayerControl {
// Get the capabilities of the player for this stream // Get the capabilities of the player for this stream
Metadata data = mp.getMetadata(MediaPlayer.METADATA_ALL, Metadata data = mp.getMetadata(MediaPlayer.METADATA_ALL,
MediaPlayer.BYPASS_METADATA_FILTER); MediaPlayer.BYPASS_METADATA_FILTER);
mCanPause = !data.has(Metadata.PAUSE_AVAILABLE)
|| data.getBoolean(Metadata.PAUSE_AVAILABLE); if (data != null) {
mCanSeekBack = !data.has(Metadata.SEEK_BACKWARD_AVAILABLE) mCanPause = !data.has(Metadata.PAUSE_AVAILABLE)
|| data.getBoolean(Metadata.SEEK_BACKWARD_AVAILABLE); || data.getBoolean(Metadata.PAUSE_AVAILABLE);
mCanSeekForward = !data.has(Metadata.SEEK_FORWARD_AVAILABLE) mCanSeekBack = !data.has(Metadata.SEEK_BACKWARD_AVAILABLE)
|| data.getBoolean(Metadata.SEEK_FORWARD_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) { if (mOnPreparedListener != null) {
mOnPreparedListener.onPrepared(mMediaPlayer); mOnPreparedListener.onPrepared(mMediaPlayer);