summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeng-Hui Zhu <ztenghui@google.com>2011-06-10 10:56:33 -0700
committerTeng-Hui Zhu <ztenghui@google.com>2011-06-10 10:56:33 -0700
commit2302fe522624b0b10d5beea4670f7269a57cda89 (patch)
treea0161299ec7194d39e5a86dee5be2fc2c0ccb330
parent8821ba860693f5206c56ae727a4231e4d6f0a735 (diff)
downloadframeworks_base-2302fe522624b0b10d5beea4670f7269a57cda89.zip
frameworks_base-2302fe522624b0b10d5beea4670f7269a57cda89.tar.gz
frameworks_base-2302fe522624b0b10d5beea4670f7269a57cda89.tar.bz2
fix one NPE when webChromeClient don't have progress view support
Change-Id: I5a88365f216d5dea38ab2eac9562d26b00a2d617
-rw-r--r--core/java/android/webkit/HTML5VideoFullScreen.java10
1 files changed, 6 insertions, 4 deletions
diff --git a/core/java/android/webkit/HTML5VideoFullScreen.java b/core/java/android/webkit/HTML5VideoFullScreen.java
index 0918683..5a9b054 100644
--- 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;
}