am 5a9bbc34: am b5141a9f: am 90bdb69b: Merge "fix one NPE when webChromeClient don\'t have progress view support" into honeycomb-mr2

* commit '5a9bbc34cb2a83188b7407c4f7bae47e40593c34':
  fix one NPE when webChromeClient don't have progress view support
This commit is contained in:
Teng-Hui Zhu
2011-06-10 15:21:26 -07:00
committed by Android Git Automerger

View File

@@ -318,10 +318,12 @@ public class HTML5VideoFullScreen extends HTML5VideoView
@Override
protected void switchProgressView(boolean playerBuffering) {
if (playerBuffering) {
mProgressView.setVisibility(View.VISIBLE);
} else {
mProgressView.setVisibility(View.GONE);
if (mProgressView != null) {
if (playerBuffering) {
mProgressView.setVisibility(View.VISIBLE);
} else {
mProgressView.setVisibility(View.GONE);
}
}
return;
}