From 422400f92d56d42bb234c7f9407a00b3bc836907 Mon Sep 17 00:00:00 2001
From: Teng-Hui Zhu <ztenghui@google.com>
Date: Fri, 11 May 2012 11:52:04 -0700
Subject: Fix a crash.

End can happen when error happens, but media controller may be not ready yet.

bug:5340224
Change-Id: I94607dfdf26d2dc4c7bbc9c2a62f98deccb8d198
---
 core/java/android/webkit/HTML5VideoFullScreen.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'core/java/android/webkit/HTML5VideoFullScreen.java')

diff --git a/core/java/android/webkit/HTML5VideoFullScreen.java b/core/java/android/webkit/HTML5VideoFullScreen.java
index ea8f316a814f..62bc502b79e2 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:
-- 
cgit v1.2.3