Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 337756fa authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am 78ad66b4: Merge "[Audio]Press camera button during Http live Audio playing,... 

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

* commit '78ad66b4':
  [Audio]Press camera button during Http live Audio playing, then return Browser, DUT display abnormal.
parents 129d6fac 78ad66b4

core/java/android/widget/MediaController.java

+2 −1
Original line number Diff line number Diff line
@@ -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) {