commit 4e6c1da41cbb804bfefe792f33c0fc44c96ddc87
author Teng-Hui Zhu <ztenghui@google.com> Fri Jun 10 15:21:26 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Jun 10 15:21:26 2011 -0700
tree c2c5b4d02ff0f83810360aa3c4681ce82ff87801
parent 8b7eede0bc4e11e6f8ddeffa2b349c29c5e47b7e
parent 5a9bbc34cb2a83188b7407c4f7bae47e40593c34

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

core/java/android/webkit/HTML5VideoFullScreen.java

diff --git a/core/java/android/webkit/HTML5VideoFullScreen.java b/core/java/android/webkit/HTML5VideoFullScreen.java
index 57cda97..44229a4 100644
--- a/core/java/android/webkit/HTML5VideoFullScreen.java
+++ b/core/java/android/webkit/HTML5VideoFullScreen.java
@@ -318,10 +318,12 @@
 
     @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;
     }