am ef279363: Merge "Fix a crash." into jb-dev

* commit 'ef279363716706192b4da543fcae3e92cc14d27e': Fix a crash.
2012-05-11 13:47:38 -07:00
parent fd086b9510 ef27936371
commit 08df9eac6e
1 changed files with 3 additions and 1 deletions
--- 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: