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

This commit is contained in:
Bart Sears
2011-10-26 00:08:59 -07:00
committed by Android (Google) Code Review

View File

@@ -571,7 +571,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
if (!mPowerKeyHandled) { if (!mPowerKeyHandled) {
mHandler.removeCallbacks(mPowerLongPress); mHandler.removeCallbacks(mPowerLongPress);
} }
mPendingPowerKeyUpCanceled = true; if (mPowerKeyTriggered) {
mPendingPowerKeyUpCanceled = true;
}
} }
private void interceptScreenshotChord() { private void interceptScreenshotChord() {