am d887377a: Merge "Fix power key handling after volume change. Bug: 5497716" into ics-mr0

* commit 'd887377aa84f0d422cf605dad981f8dc53c0f99f': Fix power key handling after volume change. Bug: 5497716
2011-10-26 12:22:44 +00:00
parent c6592d2eb8 d887377aa8
commit 6e03b22015
1 changed files with 3 additions and 1 deletions
--- 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() {