summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Wright <michaelwr@google.com>2015-05-12 12:12:47 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-12 12:12:50 +0000
commit6959865fb0de965b5a2c7a797bf26b8bf9d10228 (patch)
tree9757f98fb95c34f016cfd225a0697729ea337749
parent5a7587fa90732c013bb9266f1bdae0a557455c15 (diff)
parentd14439bbc4b3ce9cc211810e54b40100dbbf7f3b (diff)
downloadframeworks_base-6959865fb0de965b5a2c7a797bf26b8bf9d10228.zip
frameworks_base-6959865fb0de965b5a2c7a797bf26b8bf9d10228.tar.gz
frameworks_base-6959865fb0de965b5a2c7a797bf26b8bf9d10228.tar.bz2
Merge "Remove SLEEP and POWER from wake key list." into mnc-dev
-rw-r--r--core/java/android/view/KeyEvent.java2
1 files changed, 0 insertions, 2 deletions
diff --git a/core/java/android/view/KeyEvent.java b/core/java/android/view/KeyEvent.java
index 1ac3f45..f6ce353 100644
--- a/core/java/android/view/KeyEvent.java
+++ b/core/java/android/view/KeyEvent.java
@@ -1817,9 +1817,7 @@ public class KeyEvent extends InputEvent implements Parcelable {
public static final boolean isWakeKey(int keyCode) {
switch (keyCode) {
case KeyEvent.KEYCODE_BACK:
- case KeyEvent.KEYCODE_POWER:
case KeyEvent.KEYCODE_MENU:
- case KeyEvent.KEYCODE_SLEEP:
case KeyEvent.KEYCODE_WAKEUP:
case KeyEvent.KEYCODE_PAIRING:
return true;