commit 0d1aa05fa6f9dec2b77836f2ca91dce7af9c14ce
author Jim Miller <jaggies@google.com> Mon Jan 17 23:31:21 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Jan 17 23:31:21 2011 -0800
tree f88547dbd6d8b547bdd74d6616f447b03680882e
parent b61cdf0231bf3662c7dc79f3859bb8c5935f84c6
parent d0861c8992356296115dc203feb50ce8a8794bd9

am d0861c89: am 3d7a9707: Merge "Fix 3210299: Extend lock screen wake timeout to 10s" into honeycomb

* commit 'd0861c8992356296115dc203feb50ce8a8794bd9':
  Fix 3210299: Extend lock screen wake timeout to 10s

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

diff --git a/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java b/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java
index c0c3afd..7809961 100644
--- a/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java
+++ b/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java
@@ -123,7 +123,7 @@
     /**
      * The default amount of time we stay awake (used for all key input)
      */
-    protected static final int AWAKE_INTERVAL_DEFAULT_MS = 5000;
+    protected static final int AWAKE_INTERVAL_DEFAULT_MS = 10000;
 
 
     /**