diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2011-06-10 14:27:13 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-10 14:27:13 -0700 |
| commit | 5a9bbc34cb2a83188b7407c4f7bae47e40593c34 (patch) | |
| tree | 64a2c8d3a7f6d28d8754090ce9b80a568d55b879 /core | |
| parent | 75612e9c3f92364ba1f0a7fce46f1df11b0a14ca (diff) | |
| parent | b5141a9fc7e841167c3e07f8797d8aef9a787d25 (diff) | |
| download | frameworks_base-5a9bbc34cb2a83188b7407c4f7bae47e40593c34.zip frameworks_base-5a9bbc34cb2a83188b7407c4f7bae47e40593c34.tar.gz frameworks_base-5a9bbc34cb2a83188b7407c4f7bae47e40593c34.tar.bz2 | |
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
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/webkit/HTML5VideoFullScreen.java | 10 |
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; } |