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

Commit b06e7808 authored by Jaewan Kim's avatar Jaewan Kim Committed by Automerger Merge Worker
Browse files

Merge "Stop ignoring media key events in PhoneFallbackEventHandler while in... 

Merge "Stop ignoring media key events in PhoneFallbackEventHandler while in call" into sc-dev am: d05e7856 am: 344489a9 am: c128a84e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14495988

Change-Id: I6cc7ba1e5875530ec4647a7c607de94a0c8bf85f
parents f7638448 c128a84e

core/java/com/android/internal/policy/PhoneFallbackEventHandler.java

+0 −5
Original line number Original line Diff line number Diff line
@@ -97,11 +97,6 @@ public class PhoneFallbackEventHandler implements FallbackEventHandler { 
            case KeyEvent.KEYCODE_MEDIA_PLAY:

            case KeyEvent.KEYCODE_MEDIA_PLAY:

            case KeyEvent.KEYCODE_MEDIA_PAUSE:

            case KeyEvent.KEYCODE_MEDIA_PAUSE:

            case KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE:

            case KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE:

                /* Suppress PLAY/PAUSE toggle when phone is ringing or in-call

                 * to avoid music playback */

                if (getTelephonyManager().getCallState() != TelephonyManager.CALL_STATE_IDLE) {

                    return true;  // suppress key event

                }

            case KeyEvent.KEYCODE_MUTE:

            case KeyEvent.KEYCODE_MUTE:

            case KeyEvent.KEYCODE_HEADSETHOOK:

            case KeyEvent.KEYCODE_HEADSETHOOK:

            case KeyEvent.KEYCODE_MEDIA_STOP:

            case KeyEvent.KEYCODE_MEDIA_STOP: