am 728e6c6c: Merge "Prevent showing immersive confirmation unexpectedly"

* commit '728e6c6c1789a1ae141bd0ecc21e8d9dca8dadcc':
  Prevent showing immersive confirmation unexpectedly
This commit is contained in:
Craig Mautner
2014-11-30 23:59:40 +00:00
committed by Android Git Automerger

View File

@@ -4389,7 +4389,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
result &= ~ACTION_PASS_TO_USER;
if (down) {
boolean panic = mImmersiveModeConfirmation.onPowerKeyDown(interactive,
event.getDownTime(), isImmersiveMode(mLastSystemUiFlags));
SystemClock.elapsedRealtime(), isImmersiveMode(mLastSystemUiFlags));
if (panic) {
mHandler.post(mRequestTransientNav);
}