diff options
| author | Bart Sears <bsears@google.com> | 2011-10-26 00:08:59 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-26 00:08:59 -0700 |
| commit | d887377aa84f0d422cf605dad981f8dc53c0f99f (patch) | |
| tree | d9f207a243d44c8291eaafce0db9025776afa3c3 | |
| parent | 67a1b7d6e5857d0ecdd1aa9d50d10189e5776c11 (diff) | |
| parent | ff20471b082996243224e006cad19fef8fa80d7c (diff) | |
| download | frameworks_base-d887377aa84f0d422cf605dad981f8dc53c0f99f.zip frameworks_base-d887377aa84f0d422cf605dad981f8dc53c0f99f.tar.gz frameworks_base-d887377aa84f0d422cf605dad981f8dc53c0f99f.tar.bz2 | |
Merge "Fix power key handling after volume change. Bug: 5497716" into ics-mr0
| -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() { |