Merge "getDuration can be only called after prepared. DO NOT MERGE" into ics-mr1

Bart Sears · Android (Google) Code Review · commit a476eed6b291 · 2012-01-06T15:45:13.000-08:00
diff --git a/core/java/android/webkit/HTML5Audio.java b/core/java/android/webkit/HTML5Audio.java
@@ -311,7 +311,11 @@ private void teardown() {
     }
 
     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);

Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,11 @@ private void teardown() {`
`311`	`311`	`}`
`312`	`312`
`313`	`313`	`private float getMaxTimeSeekable() {`
`314`		`- return mMediaPlayer.getDuration() / 1000.0f;`
	`314`	`+ if (mState >= PREPARED) {`
	`315`	`+ return mMediaPlayer.getDuration() / 1000.0f;`
	`316`	`+ } else {`
	`317`	`+ return 0;`
	`318`	`+ }`
`315`	`319`	`}`
`316`	`320`
`317`	`321`	`private native void nativeOnBuffering(int percent, int nativePointer);`