am 337756f: am 78ad66b: Merge "[Audio]Press camera button during Http live Audio playing, then return Browser, DUT display abnormal."

* commit '337756fa6587bca84afdfdc964805f962ea534ed':
  [Audio]Press camera button during Http live Audio playing, then return Browser, DUT display abnormal.

Author: Jean-Baptiste Queru

core/java/android/widget/MediaController.java

@@ -477,7 +477,8 @@ public boolean dispatchKeyEvent(KeyEvent event) {
             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) {