summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Craig Mautner <cmautner@google.com> 2012-10-16 13:39:47 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2012-10-16 13:39:47 -0700
commit417b05912a2eb960d59541d546d1e857f95d906b (patch)
treeb340801aa617ec4eeaeb331c616943e032c26d2b
parent04876317518b89888ee52e68caec26f6061eb621 (diff)
parenta4942c9fb9cc224bcb1a0a53dcacd13848819951 (diff)
Merge "Revert app freeze timeout delay." into jb-mr1-dev
-rwxr-xr-xservices/java/com/android/server/wm/WindowManagerService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java
index c3418727e338..b18727b24138 100755
--- a/services/java/com/android/server/wm/WindowManagerService.java
+++ b/services/java/com/android/server/wm/WindowManagerService.java
@@ -265,7 +265,7 @@ public class WindowManagerService extends IWindowManager.Stub
static final int DEFAULT_FADE_IN_OUT_DURATION = 400;
/** Amount of time (in milliseconds) to delay before declaring a window freeze timeout. */
- static final int WINDOW_FREEZE_TIMEOUT_DURATION = 3000;
+ static final int WINDOW_FREEZE_TIMEOUT_DURATION = 2000;
/**
* If true, the window manager will do its own custom freezing and general