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

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

Browse Source 
* commit 'a476eed6b291d06f5e571597b928b7b2f0b3f257':
  getDuration can be only called after prepared. DO NOT MERGE
This commit is contained in:
Bart Sears
2012-01-06 15:47:04 -08:00
committed by Android Git Automerger
parent f817e94133 a476eed6b2
commit c2eaee533f
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/webkit/HTML5Audio.java
View File

@@ -311,7 +311,11 @@ class HTML5Audio extends Handler
} }
private float getMaxTimeSeekable() { 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); private native void nativeOnBuffering(int percent, int nativePointer);