diff options
| author | 2019-06-26 06:49:21 +0000 | |
|---|---|---|
| committer | 2019-06-26 06:49:21 +0000 | |
| commit | dec76b8a4080b5559a47d6b1815d5ad3763c62d2 (patch) | |
| tree | cced79f96c276943fa5bd63e0418141b62e78a04 | |
| parent | b6ae55b169c484576b11bf572108a8bb9a5c1564 (diff) | |
| parent | 2deb9b54d92f91435eb6cd19504e943b5543cf29 (diff) | |
Merge "PhoneWindowManager/KeyEvent: Camera key as WakeKey"
| -rw-r--r-- | core/java/android/view/KeyEvent.java | 3 | ||||
| -rw-r--r-- | services/core/java/com/android/server/policy/PhoneWindowManager.java | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/view/KeyEvent.java b/core/java/android/view/KeyEvent.java index 78331a1566c5..b33b4a07c134 100644 --- a/core/java/android/view/KeyEvent.java +++ b/core/java/android/view/KeyEvent.java @@ -1893,12 +1893,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; diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index 0149d30da6bd..caf0b92a55e0 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -6482,7 +6482,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { case KeyEvent.KEYCODE_VOLUME_MUTE: return mDockMode != 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: @@ -6495,7 +6495,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; |