diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2012-05-11 11:52:04 -0700 |
|---|---|---|
| committer | Teng-Hui Zhu <ztenghui@google.com> | 2012-05-11 13:00:03 -0700 |
| commit | 422400f92d56d42bb234c7f9407a00b3bc836907 (patch) | |
| tree | 875fbb6649c621fa3deee7851f1ff6a78de170fb | |
| parent | 9ac320406bcd0212923bfc0b4068df0b022fd4f7 (diff) | |
| download | frameworks_base-422400f92d56d42bb234c7f9407a00b3bc836907.zip frameworks_base-422400f92d56d42bb234c7f9407a00b3bc836907.tar.gz frameworks_base-422400f92d56d42bb234c7f9407a00b3bc836907.tar.bz2 | |
Fix a crash.
End can happen when error happens, but media controller may be not ready yet.
bug:5340224
Change-Id: I94607dfdf26d2dc4c7bbc9c2a62f98deccb8d198
| -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: |