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

* commit 'b5141a9fc7e841167c3e07f8797d8aef9a787d25':
  fix one NPE when webChromeClient don't have progress view support
This commit is contained in:
Teng-Hui Zhu
2011-06-10 14:27:13 -07:00
committed by Android Git Automerger

View File

@@ -314,10 +314,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;
}