diff options
author | Keith Mok <kmok@cyngn.com> | 2015-11-16 13:48:36 -0800 |
---|---|---|
committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2015-11-17 10:27:23 -0800 |
commit | a5a5a9839f4b0ca3024df309cf25a073550bc832 (patch) | |
tree | a8be88263829909b6f05c343fc16d8dd3d883831 /services/core/java/com/android/server/policy/PhoneWindowManager.java | |
parent | bfaa0f5531111b2ca90987405f1f4761c3f26883 (diff) | |
download | frameworks_base-a5a5a9839f4b0ca3024df309cf25a073550bc832.zip frameworks_base-a5a5a9839f4b0ca3024df309cf25a073550bc832.tar.gz frameworks_base-a5a5a9839f4b0ca3024df309cf25a073550bc832.tar.bz2 |
DeviceKeyHandler: Fix suspend gesture not working
A function for handling DeviceKey is mis-placed in
PhoneWindowManager.java when merging from cm-12.1
Change-Id: I5a5421c88216b70defaac69b732d99d506e1a2a6
Diffstat (limited to 'services/core/java/com/android/server/policy/PhoneWindowManager.java')
-rw-r--r-- | services/core/java/com/android/server/policy/PhoneWindowManager.java | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index 58cf7af..f20f802 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -3632,18 +3632,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { final boolean initialDown = event.getAction() == KeyEvent.ACTION_DOWN && event.getRepeatCount() == 0; - // Specific device key handling - if (mDeviceKeyHandler != null) { - try { - // The device only should consume known keys. - if (mDeviceKeyHandler.handleKeyEvent(event)) { - return null; - } - } catch (Exception e) { - Slog.w(TAG, "Could not dispatch event to device key handler", e); - } - } - // Check for fallback actions specified by the key character map. final FallbackAction fallbackAction; if (initialDown) { @@ -5610,6 +5598,18 @@ public class PhoneWindowManager implements WindowManagerPolicy { && (policyFlags & WindowManagerPolicy.FLAG_VIRTUAL) != 0 && event.getRepeatCount() == 0; + // Specific device key handling + if (mDeviceKeyHandler != null) { + try { + // The device only should consume known keys. + if (mDeviceKeyHandler.handleKeyEvent(event)) { + return 0; + } + } catch (Exception e) { + Slog.w(TAG, "Could not dispatch event to device key handler", e); + } + } + // Handle special keys. switch (keyCode) { case KeyEvent.KEYCODE_VOLUME_DOWN: |