diff options
author | 2012-01-06 15:47:04 -0800 | |
---|---|---|
committer | 2012-01-06 15:47:04 -0800 | |
commit | c2eaee533fe25cd9a0781f349e9c8c7ef02bd648 (patch) | |
tree | 08bea7bd2f4c6d0cb2edc97ef6bbb2e21193a1f9 | |
parent | f817e9413356de2a303e14709e67457190e976c9 (diff) | |
parent | a476eed6b291d06f5e571597b928b7b2f0b3f257 (diff) |
am a476eed6: Merge "getDuration can be only called after prepared. DO NOT MERGE" into ics-mr1
* commit 'a476eed6b291d06f5e571597b928b7b2f0b3f257':
getDuration can be only called after prepared. DO NOT MERGE
-rw-r--r-- | core/java/android/webkit/HTML5Audio.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/webkit/HTML5Audio.java b/core/java/android/webkit/HTML5Audio.java index 97d61ba73d55..0baf2eb7371e 100644 --- a/core/java/android/webkit/HTML5Audio.java +++ b/core/java/android/webkit/HTML5Audio.java @@ -311,7 +311,11 @@ class HTML5Audio extends Handler } private float getMaxTimeSeekable() { - return mMediaPlayer.getDuration() / 1000.0f; + if (mState >= PREPARED) { + return mMediaPlayer.getDuration() / 1000.0f; + } else { + return 0; + } } private native void nativeOnBuffering(int percent, int nativePointer); |