Merge "Fix a crash." into jb-dev

Teng-Hui Zhu · Android (Google) Code Review · commit ef2793637167 · 2012-05-11T13:45:13.000-07:00
diff --git a/core/java/android/webkit/HTML5VideoFullScreen.java b/core/java/android/webkit/HTML5VideoFullScreen.java
@@ -323,7 +323,9 @@ public int getBufferPercentage() {
 
     @Override
     public void showControllerInFullScreen() {
-        mMediaController.show(0);
+        if (mMediaController != null) {
+            mMediaController.show(0);
+        }
     }
 
     // Other listeners functions:

Original file line number	Diff line number	Diff line change
`@@ -323,7 +323,9 @@ public int getBufferPercentage() {`
`323`	`323`
`324`	`324`	`@Override`
`325`	`325`	`public void showControllerInFullScreen() {`
`326`		`- mMediaController.show(0);`
	`326`	`+ if (mMediaController != null) {`
	`327`	`+ mMediaController.show(0);`
	`328`	`+ }`
`327`	`329`	`}`
`328`	`330`
`329`	`331`	`// Other listeners functions:`