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

Commit 226524fd authored by Vaibhav Devmurari's avatar Vaibhav Devmurari Committed by Automerger Merge Worker
Browse files

Merge "Allow media keys from external keyboard to wake the device" into... 

Merge "Allow media keys from external keyboard to wake the device" into udc-dev am: 610ef28a am: e92d16c3

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



Change-Id: Ib7ee20f88c664d9d69ec674e6cb14eee40a7a37e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b528ae9f e92d16c3

services/core/java/com/android/server/policy/PhoneWindowManager.java

+0 −19
Original line number Diff line number Diff line
@@ -4553,25 +4553,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
     */

    private boolean isWakeKeyWhenScreenOff(int keyCode) {

        switch (keyCode) {

            case KeyEvent.KEYCODE_VOLUME_UP:

            case KeyEvent.KEYCODE_VOLUME_DOWN:

            case KeyEvent.KEYCODE_VOLUME_MUTE:

                return mDefaultDisplayPolicy.getDockMode() != Intent.EXTRA_DOCK_STATE_UNDOCKED;



            case KeyEvent.KEYCODE_MUTE:

            case KeyEvent.KEYCODE_HEADSETHOOK:

            case KeyEvent.KEYCODE_MEDIA_PLAY:

            case KeyEvent.KEYCODE_MEDIA_PAUSE:

            case KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE:

            case KeyEvent.KEYCODE_MEDIA_STOP:

            case KeyEvent.KEYCODE_MEDIA_NEXT:

            case KeyEvent.KEYCODE_MEDIA_PREVIOUS:

            case KeyEvent.KEYCODE_MEDIA_REWIND:

            case KeyEvent.KEYCODE_MEDIA_RECORD:

            case KeyEvent.KEYCODE_MEDIA_FAST_FORWARD:

            case KeyEvent.KEYCODE_MEDIA_AUDIO_TRACK:

                return false;



            case KeyEvent.KEYCODE_DPAD_UP:

            case KeyEvent.KEYCODE_DPAD_DOWN:

            case KeyEvent.KEYCODE_DPAD_LEFT: