From ff20471b082996243224e006cad19fef8fa80d7c Mon Sep 17 00:00:00 2001
From: Jeff Brown <jeffbrown@google.com>
Date: Tue, 25 Oct 2011 21:27:54 -0700
Subject: [PATCH] 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
---
 .../com/android/internal/policy/impl/PhoneWindowManager.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
index 318ad9e89f0d1..0a77654f916c9 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() {