1 files changed, 6 insertions, 1 deletions
diff --git a/core/java/android/widget/VideoView.java b/core/java/android/widget/VideoView.java
index df4015670bd6..1227afd9c186 100644
--- a/core/java/android/widget/VideoView.java
+++ b/core/java/android/widget/VideoView.java
@@ -447,7 +447,8 @@ public class VideoView extends SurfaceView implements MediaPlayerControl {
                 keyCode != KeyEvent.KEYCODE_ENDCALL &&
                 mMediaPlayer != null &&
                 mMediaController != null) {
-            if (keyCode == KeyEvent.KEYCODE_HEADSETHOOK) {
+            if (keyCode == KeyEvent.KEYCODE_HEADSETHOOK ||
+                    keyCode == KeyEvent.KEYCODE_PLAYPAUSE) {
                 if (mMediaPlayer.isPlaying()) {
                     pause();
                     mMediaController.show();
@@ -456,6 +457,10 @@ public class VideoView extends SurfaceView implements MediaPlayerControl {
                     mMediaController.hide();
                 }
                 return true;
+            } else if (keyCode == KeyEvent.KEYCODE_STOP 
+                    && mMediaPlayer.isPlaying()) {
+                pause();
+                mMediaController.show();
             } else {
                 toggleMediaControlsVisiblity();
             }