diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2011-06-10 15:21:26 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-10 15:21:26 -0700 |
| commit | 4e6c1da41cbb804bfefe792f33c0fc44c96ddc87 (patch) | |
| tree | c2c5b4d02ff0f83810360aa3c4681ce82ff87801 /core/java/android/webkit/HTML5VideoFullScreen.java | |
| parent | 8b7eede0bc4e11e6f8ddeffa2b349c29c5e47b7e (diff) | |
| parent | 5a9bbc34cb2a83188b7407c4f7bae47e40593c34 (diff) | |
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
Diffstat (limited to 'core/java/android/webkit/HTML5VideoFullScreen.java')
| -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 57cda97f8235..44229a42be9a 100644 --- a/core/java/android/webkit/HTML5VideoFullScreen.java +++ b/core/java/android/webkit/HTML5VideoFullScreen.java @@ -318,10 +318,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; } |