diff options
author | Ben Murdoch <benm@google.com> | 2010-12-09 11:54:24 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-12-09 11:54:24 -0800 |
commit | e627f55bf8eaadf8d404b9592608e05b8a33ef5e (patch) | |
tree | 32675a7d89fe0f743c249093b35f714924724bb0 /core | |
parent | d4de05eae314ff1f503ce513553dab8519febe58 (diff) | |
parent | 9059f44feedbbde4f486c9448b4818ba54f50538 (diff) | |
download | frameworks_base-e627f55bf8eaadf8d404b9592608e05b8a33ef5e.zip frameworks_base-e627f55bf8eaadf8d404b9592608e05b8a33ef5e.tar.gz frameworks_base-e627f55bf8eaadf8d404b9592608e05b8a33ef5e.tar.bz2 |
Merge "Make audio tag cope with live streams"
Diffstat (limited to 'core')
-rw-r--r-- | core/java/android/webkit/HTML5Audio.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/webkit/HTML5Audio.java b/core/java/android/webkit/HTML5Audio.java index d292881..a3906ddb 100644 --- a/core/java/android/webkit/HTML5Audio.java +++ b/core/java/android/webkit/HTML5Audio.java @@ -179,7 +179,7 @@ class HTML5Audio extends Handler } private void play() { - if ((mState == ERROR || mState == IDLE) && mUrl != null) { + if ((mState >= ERROR && mState < PREPARED) && mUrl != null) { resetMediaPlayer(); setDataSource(mUrl); mAskToPlay = true; |