Merge "fix one NPE when webChromeClient don't have progress view support" into honeycomb-mr2

2011-06-10 14:19:22 -07:00
parent 2bb2d48f9c 2302fe5226
commit 90bdb69bf9
1 changed files with 6 additions and 4 deletions
--- a/core/java/android/webkit/HTML5VideoFullScreen.java
+++ b/core/java/android/webkit/HTML5VideoFullScreen.java
@@ -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;
    }