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
This commit is contained in:
Jim Miller
2011-01-17 23:31:21 -08:00
committed by Android Git Automerger

View File

@@ -123,7 +123,7 @@ public class KeyguardViewMediator implements KeyguardViewCallback,
/**
* 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;
/**