diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2012-05-11 13:47:38 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-11 13:47:38 -0700 |
| commit | 08df9eac6e7ef246afb5ccd9d7cccadcb131e7b2 (patch) | |
| tree | 16623d9a83706365746b5313de5419a87a1e6fba | |
| parent | fd086b95103e8c7fbe853f5702aaa7d04f2141f0 (diff) | |
| parent | ef279363716706192b4da543fcae3e92cc14d27e (diff) | |
| download | frameworks_base-08df9eac6e7ef246afb5ccd9d7cccadcb131e7b2.zip frameworks_base-08df9eac6e7ef246afb5ccd9d7cccadcb131e7b2.tar.gz frameworks_base-08df9eac6e7ef246afb5ccd9d7cccadcb131e7b2.tar.bz2 | |
am ef279363: Merge "Fix a crash." into jb-dev
* commit 'ef279363716706192b4da543fcae3e92cc14d27e':
Fix a crash.
| -rw-r--r-- | core/java/android/webkit/HTML5VideoFullScreen.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/webkit/HTML5VideoFullScreen.java b/core/java/android/webkit/HTML5VideoFullScreen.java index ea8f316..62bc502 100644 --- a/core/java/android/webkit/HTML5VideoFullScreen.java +++ b/core/java/android/webkit/HTML5VideoFullScreen.java @@ -323,7 +323,9 @@ public class HTML5VideoFullScreen extends HTML5VideoView @Override public void showControllerInFullScreen() { - mMediaController.show(0); + if (mMediaController != null) { + mMediaController.show(0); + } } // Other listeners functions: |