Merge "getDuration can be only called after prepared."

2012-01-05 14:47:01 -08:00
parent 0df0ed5814 0d1d30b330
commit a4ad2928eb
1 changed files with 5 additions and 1 deletions
--- 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);