commit 728e6c6c1789a1ae141bd0ecc21e8d9dca8dadcc
author Craig Mautner <cmautner@google.com> Sun Nov 30 23:54:42 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sun Nov 30 23:54:43 2014 +0000
tree abdce3bc3c0208012c7766fb93312cc9d453450f
parent 2c53d22bcc00838125cd70e17915da6ded5d0aca
parent 1b33b497239d783ea25acd31764836818ebd65b5

Merge "Prevent showing immersive confirmation unexpectedly"

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

diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
index 2699d13b..ccc700d 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -4389,7 +4389,7 @@
                 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);
                     }