Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e03b220 authored by Bart Sears's avatar Bart Sears Committed by Android Git Automerger
Browse files

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

* commit 'd887377a':
  Fix power key handling after volume change. Bug: 5497716
parents c6592d2e d887377a

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+3 −1
Original line number Diff line number Diff line
@@ -571,8 +571,10 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        if (!mPowerKeyHandled) {

            mHandler.removeCallbacks(mPowerLongPress);

        }

        if (mPowerKeyTriggered) {

            mPendingPowerKeyUpCanceled = true;

        }

    }



    private void interceptScreenshotChord() {

        if (mVolumeDownKeyTriggered && mPowerKeyTriggered && !mVolumeUpKeyTriggered) {