diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2012-05-11 13:45:13 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-11 13:45:13 -0700 |
| commit | ef279363716706192b4da543fcae3e92cc14d27e (patch) | |
| tree | b5590c42f7ed9d87292a88b522ef0ce3ef75f9e4 | |
| parent | 76f082189ec451433d942fcee5ca2913f4132e6b (diff) | |
| parent | 422400f92d56d42bb234c7f9407a00b3bc836907 (diff) | |
| download | frameworks_base-ef279363716706192b4da543fcae3e92cc14d27e.zip frameworks_base-ef279363716706192b4da543fcae3e92cc14d27e.tar.gz frameworks_base-ef279363716706192b4da543fcae3e92cc14d27e.tar.bz2 | |
Merge "Fix a crash." into jb-dev
| -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: |