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

2011-10-26 00:08:59 -07:00
parent 67a1b7d6e5 ff20471b08
commit d887377aa8
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() {