summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Teng-Hui Zhu <ztenghui@google.com> 2012-01-05 14:50:19 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2012-01-05 14:50:19 -0800
commitebb9423e89480c63a6b322b8e30ddf291680d6cb (patch)
treee66d99e8a82aea8a7f72e2dbaf71baeab0ae427b
parentd0c2d4f21e982390f61e3e45339c2f277e052cf3 (diff)
parenta4ad2928eb47974e922191dd008dfa98e3711ca0 (diff)
am a4ad2928: Merge "getDuration can be only called after prepared."
* commit 'a4ad2928eb47974e922191dd008dfa98e3711ca0': getDuration can be only called after prepared.
-rw-r--r--core/java/android/webkit/HTML5Audio.java6
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);