diff options
| author | Jeff Brown <jeffbrown@google.com> | 2011-10-25 21:27:54 -0700 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@google.com> | 2011-10-25 21:30:40 -0700 |
| commit | ff20471b082996243224e006cad19fef8fa80d7c (patch) | |
| tree | 7d2eabf5f4e00c9ffcd4522c4c4a465f83f4fb29 | |
| parent | 7a962fef2f26b941b916595562d5adfae943d432 (diff) | |
| download | frameworks_base-ff20471b082996243224e006cad19fef8fa80d7c.zip frameworks_base-ff20471b082996243224e006cad19fef8fa80d7c.tar.gz frameworks_base-ff20471b082996243224e006cad19fef8fa80d7c.tar.bz2 | |
Fix power key handling after volume change.
Bug: 5497716
We should only cancel the pending power key when there
actually is one pending.
Change-Id: Iab684d24a643e1be4a8abde5cf905ca1819e9aa8
| -rwxr-xr-x | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 318ad9e..0a77654 100755 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -571,7 +571,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { if (!mPowerKeyHandled) { mHandler.removeCallbacks(mPowerLongPress); } - mPendingPowerKeyUpCanceled = true; + if (mPowerKeyTriggered) { + mPendingPowerKeyUpCanceled = true; + } } private void interceptScreenshotChord() { |