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

Commit 727d193d authored by Felix's avatar Felix Committed by android-build-merger
Browse files

Merge "PhoneWindowManager/KeyEvent: Camera key as WakeKey" am: dec76b8a am: 1841f6af 

am: de67a21c

Change-Id: I6c8450688f79394195e493877156e67330d022ff
parents b8c55cfc de67a21c

core/java/android/view/KeyEvent.java

+2 −1
Original line number Diff line number Diff line
@@ -1934,12 +1934,13 @@ public class KeyEvent extends InputEvent implements Parcelable { 
    public static final boolean isWakeKey(int keyCode) {

        switch (keyCode) {

            case KeyEvent.KEYCODE_BACK:

            case KeyEvent.KEYCODE_CAMERA:

            case KeyEvent.KEYCODE_MENU:

            case KeyEvent.KEYCODE_WAKEUP:

            case KeyEvent.KEYCODE_PAIRING:

            case KeyEvent.KEYCODE_STEM_1:

            case KeyEvent.KEYCODE_STEM_2:

            case KeyEvent.KEYCODE_STEM_3:

            case KeyEvent.KEYCODE_WAKEUP:

                return true;

        }

        return false;

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

+1 −2
Original line number Diff line number Diff line
@@ -4156,7 +4156,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            case KeyEvent.KEYCODE_VOLUME_MUTE:

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



            // ignore media and camera keys

            // ignore media keys

            case KeyEvent.KEYCODE_MUTE:

            case KeyEvent.KEYCODE_HEADSETHOOK:

            case KeyEvent.KEYCODE_MEDIA_PLAY:
@@ -4169,7 +4169,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            case KeyEvent.KEYCODE_MEDIA_RECORD:

            case KeyEvent.KEYCODE_MEDIA_FAST_FORWARD:

            case KeyEvent.KEYCODE_MEDIA_AUDIO_TRACK:

            case KeyEvent.KEYCODE_CAMERA:

                return false;

        }

        return true;