summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Craig Mautner <cmautner@google.com> 2014-11-30 23:54:42 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2014-11-30 23:54:43 +0000
commit728e6c6c1789a1ae141bd0ecc21e8d9dca8dadcc (patch)
treeabdce3bc3c0208012c7766fb93312cc9d453450f
parent2c53d22bcc00838125cd70e17915da6ded5d0aca (diff)
parent1b33b497239d783ea25acd31764836818ebd65b5 (diff)
Merge "Prevent showing immersive confirmation unexpectedly"
-rw-r--r--policy/src/com/android/internal/policy/impl/PhoneWindowManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
index 2699d13b9b9e..ccc700daa909 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 @@ 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);
}