Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "PhoneWindowManager/KeyEvent: Camera key as WakeKey" am: dec76b8a40

Browse Source 
am: 1841f6af1d

Change-Id: I6771fdd3408461fb8343006a05d15c260d0fb256
This commit is contained in:
Felix
2019-06-26 00:27:32 -07:00
committed by android-build-merger
parent beef45c17c 1841f6af1d
commit de67a21c84
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/view/KeyEvent.java
View File

@@ -1934,12 +1934,13 @@ public class KeyEvent extends InputEvent implements Parcelable {
public static final boolean isWakeKey(int keyCode) { public static final boolean isWakeKey(int keyCode) {
switch (keyCode) { switch (keyCode) {
case KeyEvent.KEYCODE_BACK: case KeyEvent.KEYCODE_BACK:
case KeyEvent.KEYCODE_CAMERA:
case KeyEvent.KEYCODE_MENU: case KeyEvent.KEYCODE_MENU:
case KeyEvent.KEYCODE_WAKEUP:
case KeyEvent.KEYCODE_PAIRING: case KeyEvent.KEYCODE_PAIRING:
case KeyEvent.KEYCODE_STEM_1: case KeyEvent.KEYCODE_STEM_1:
case KeyEvent.KEYCODE_STEM_2: case KeyEvent.KEYCODE_STEM_2:
case KeyEvent.KEYCODE_STEM_3: case KeyEvent.KEYCODE_STEM_3:
case KeyEvent.KEYCODE_WAKEUP:
return true; return true;
} }
return false; return false;

3
services/core/java/com/android/server/policy/PhoneWindowManager.java
View File

@@ -4149,7 +4149,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
case KeyEvent.KEYCODE_VOLUME_MUTE: case KeyEvent.KEYCODE_VOLUME_MUTE:
return mDefaultDisplayPolicy.getDockMode() != Intent.EXTRA_DOCK_STATE_UNDOCKED; return mDefaultDisplayPolicy.getDockMode() != Intent.EXTRA_DOCK_STATE_UNDOCKED;
// ignore media and camera keys // ignore media keys
case KeyEvent.KEYCODE_MUTE: case KeyEvent.KEYCODE_MUTE:
case KeyEvent.KEYCODE_HEADSETHOOK: case KeyEvent.KEYCODE_HEADSETHOOK:
case KeyEvent.KEYCODE_MEDIA_PLAY: case KeyEvent.KEYCODE_MEDIA_PLAY:
@@ -4162,7 +4162,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
case KeyEvent.KEYCODE_MEDIA_RECORD: case KeyEvent.KEYCODE_MEDIA_RECORD:
case KeyEvent.KEYCODE_MEDIA_FAST_FORWARD: case KeyEvent.KEYCODE_MEDIA_FAST_FORWARD:
case KeyEvent.KEYCODE_MEDIA_AUDIO_TRACK: case KeyEvent.KEYCODE_MEDIA_AUDIO_TRACK:
case KeyEvent.KEYCODE_CAMERA:
return false; return false;
} }
return true; return true;