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

Bart Sears · Android Git Automerger · commit 6e03b22015bd · 2011-10-26T12:22:44.000Z
* commit 'd887377aa84f0d422cf605dad981f8dc53c0f99f':
  Fix power key handling after volume change. Bug: 5497716
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -571,7 +571,9 @@ private void cancelPendingPowerKeyAction() {
         if (!mPowerKeyHandled) {
             mHandler.removeCallbacks(mPowerLongPress);
         }
-        mPendingPowerKeyUpCanceled = true;
+        if (mPowerKeyTriggered) {
+            mPendingPowerKeyUpCanceled = true;
+        }
     }
 
     private void interceptScreenshotChord() {

Original file line number	Diff line number	Diff line change
`@@ -571,7 +571,9 @@ private void cancelPendingPowerKeyAction() {`
`571`	`571`	`if (!mPowerKeyHandled) {`
`572`	`572`	`mHandler.removeCallbacks(mPowerLongPress);`
`573`	`573`	`}`
`574`		`- mPendingPowerKeyUpCanceled = true;`
	`574`	`+ if (mPowerKeyTriggered) {`
	`575`	`+ mPendingPowerKeyUpCanceled = true;`
	`576`	`+ }`
`575`	`577`	`}`
`576`	`578`
`577`	`579`	`private void interceptScreenshotChord() {`