commit 85b1af6e9bd5e8b54f8bee04d0460234f7633743
author Michael Wright <michaelwr@google.com> Wed Jun 04 14:51:58 2014 -0700
committer Michael Wright <michaelwr@google.com> Wed Jun 25 00:16:08 2014 +0000
tree 5746100da0ffc76bc52e6864ee0f2485cc3cd707
parent ab225b301b8b13a141053a33d5dd5eeccfc69887

Global keys should wake the device if they're wake keys.

Bug: 15430207
Bug: 15434710
Change-Id: I98083e1389079f00b612ae4fae3ecab5a2a51b0d

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
index 813ba47..ddfa9c1 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -4109,6 +4109,9 @@
         // If the key would be handled globally, just return the result, don't worry about special
         // key processing.
         if (mGlobalKeyManager.shouldHandleGlobalKey(keyCode, event)) {
+            if (isWakeKey) {
+                mPowerManager.wakeUp(event.getEventTime());
+            }
             return result;
         }