From 5a4c73d34b1271e70dd043deb79ace86b2a8a21a Mon Sep 17 00:00:00 2001 From: Vaibhav Devmurari Date: Mon, 6 Mar 2023 15:02:58 +0000 Subject: [PATCH] Allow media keys from external keyboard to wake the device Media key pol to wake is handled in native and no longer needs to be handled in Phone window manager for media keys. Media keys from an external keyboard should wake the device. Test: manual Bug: 267526027 Change-Id: I831ac81ecfa8ee46d77126f0f1b57650fff40b8d --- .../server/policy/PhoneWindowManager.java | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index 37877cf8264e1..25eec425e6654 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -4507,25 +4507,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: