diff options
| author | Roman Birg <roman@cyngn.com> | 2016-04-26 16:39:47 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-05-11 14:48:45 -0700 |
| commit | b991d946994c97ee0c629a8c0cde4290e853bf11 (patch) | |
| tree | 7c34ab7c6b3b2391ae4a413be4eb9c122790b932 /services | |
| parent | caea16fc007e1b7a0fa44e490f3a64908e558c44 (diff) | |
| download | frameworks_base-b991d946994c97ee0c629a8c0cde4290e853bf11.zip frameworks_base-b991d946994c97ee0c629a8c0cde4290e853bf11.tar.gz frameworks_base-b991d946994c97ee0c629a8c0cde4290e853bf11.tar.bz2 | |
only use proximity checks on wakeup keys
The power button should always wake the screen regardless of the
proximity; only check proximity when the wake up key code is WAKEUP.
Ticket: CYNGNOS-2579
Change-Id: I686ad22d513a3d939be3a0a5c3b752339b2383d3
Signed-off-by: Roman Birg <roman@cyngn.com>
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/policy/PhoneWindowManager.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index 943bea9..d3bc83a 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -5946,7 +5946,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { } if (isWakeKey) { - wakeUp(event.getEventTime(), mAllowTheaterModeWakeFromKey, "android.policy:KEY", true); + wakeUp(event.getEventTime(), mAllowTheaterModeWakeFromKey, "android.policy:KEY", + event.getKeyCode() == KeyEvent.KEYCODE_WAKEUP /* check prox only on wake key*/); } return result; |