Merge "[Audio]Press camera button during Http live Audio playing, then return Browser, DUT display abnormal."

2012-08-28 10:43:10 -07:00
parent 67ea8c8641 96ac720117
commit 78ad66b43c
1 changed files with 2 additions and 1 deletions
--- a/core/java/android/widget/MediaController.java
+++ b/core/java/android/widget/MediaController.java
@ -477,7 +477,8 @@ public class MediaController extends FrameLayout {
            return true;
        } else if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN
                || keyCode == KeyEvent.KEYCODE_VOLUME_UP
-                || keyCode == KeyEvent.KEYCODE_VOLUME_MUTE) {
+                || keyCode == KeyEvent.KEYCODE_VOLUME_MUTE
+                || keyCode == KeyEvent.KEYCODE_CAMERA) {
            // don't show the controls for volume adjustment
            return super.dispatchKeyEvent(event);
        } else if (keyCode == KeyEvent.KEYCODE_BACK || keyCode == KeyEvent.KEYCODE_MENU) {