diff options
Diffstat (limited to 'services/java/com/android/server/wm/WindowManagerService.java')
| -rw-r--r-- | services/java/com/android/server/wm/WindowManagerService.java | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java index 096921d13eba..890dfe92fc20 100644 --- a/services/java/com/android/server/wm/WindowManagerService.java +++ b/services/java/com/android/server/wm/WindowManagerService.java @@ -254,10 +254,10 @@ 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 = 2000; + static final int WINDOW_FREEZE_TIMEOUT_DURATION = 20 * 2000; /** Amount of time (in milliseconds) to delay before declaring a starting window leaked. */ - static final int STARTING_WINDOW_TIMEOUT_DURATION = 10000; + static final int STARTING_WINDOW_TIMEOUT_DURATION = 20 * 10000; /** * If true, the window manager will do its own custom freezing and general @@ -267,10 +267,10 @@ public class WindowManagerService extends IWindowManager.Stub // Maximum number of milliseconds to wait for input devices to be enumerated before // proceding with safe mode detection. - private static final int INPUT_DEVICES_READY_FOR_SAFE_MODE_DETECTION_TIMEOUT_MILLIS = 1000; + private static final int INPUT_DEVICES_READY_FOR_SAFE_MODE_DETECTION_TIMEOUT_MILLIS = 20 * 1000; // Default input dispatching timeout in nanoseconds. - static final long DEFAULT_INPUT_DISPATCHING_TIMEOUT_NANOS = 5000 * 1000000L; + static final long DEFAULT_INPUT_DISPATCHING_TIMEOUT_NANOS = 20 * 5000 * 1000000L; /** Minimum value for createStack and resizeStack weight value */ public static final float STACK_WEIGHT_MIN = 0.2f; @@ -534,9 +534,9 @@ public class WindowManagerService extends IWindowManager.Stub // The last time we had a timeout when waiting for a wallpaper. long mLastWallpaperTimeoutTime; // We give a wallpaper up to 150ms to finish scrolling. - static final long WALLPAPER_TIMEOUT = 150; + static final long WALLPAPER_TIMEOUT = 20 * 150; // Time we wait after a timeout before trying to wait again. - static final long WALLPAPER_TIMEOUT_RECOVERY = 10000; + static final long WALLPAPER_TIMEOUT_RECOVERY = 20 * 10000; boolean mAnimateWallpaperWithTarget; AppWindowToken mFocusedApp = null; @@ -3875,7 +3875,7 @@ public class WindowManagerService extends IWindowManager.Stub mStartingIconInTransition = false; mSkipAppTransitionAnimation = false; mH.removeMessages(H.APP_TRANSITION_TIMEOUT); - mH.sendEmptyMessageDelayed(H.APP_TRANSITION_TIMEOUT, 5000); + mH.sendEmptyMessageDelayed(H.APP_TRANSITION_TIMEOUT, 20 * 5000); } } } @@ -4434,7 +4434,7 @@ public class WindowManagerService extends IWindowManager.Stub if (mAppsFreezingScreen == 1) { startFreezingDisplayLocked(false, 0, 0); mH.removeMessages(H.APP_FREEZE_TIMEOUT); - mH.sendEmptyMessageDelayed(H.APP_FREEZE_TIMEOUT, 5000); + mH.sendEmptyMessageDelayed(H.APP_FREEZE_TIMEOUT, 20 * 5000); } } final int N = wtoken.allAppWindows.size(); @@ -4965,7 +4965,7 @@ public class WindowManagerService extends IWindowManager.Stub try { startFreezingDisplayLocked(false, exitAnim, enterAnim); mH.removeMessages(H.CLIENT_FREEZE_TIMEOUT); - mH.sendEmptyMessageDelayed(H.CLIENT_FREEZE_TIMEOUT, 5000); + mH.sendEmptyMessageDelayed(H.CLIENT_FREEZE_TIMEOUT, 20* 5000); } finally { Binder.restoreCallingIdentity(origId); } @@ -5244,7 +5244,7 @@ public class WindowManagerService extends IWindowManager.Stub hideBootMessagesLocked(); // If the screen still doesn't come up after 30 seconds, give // up and turn it on. - mH.sendEmptyMessageDelayed(H.BOOT_TIMEOUT, 30*1000); + mH.sendEmptyMessageDelayed(H.BOOT_TIMEOUT, 20 * 30*1000); } mPolicy.systemBooted(); @@ -7357,7 +7357,7 @@ public class WindowManagerService extends IWindowManager.Stub if (mAnimator.mAnimating || mAnimationScheduled) { // If we are animating, don't do the gc now but // delay a bit so we don't interrupt the animation. - sendEmptyMessageDelayed(H.FORCE_GC, 2000); + sendEmptyMessageDelayed(H.FORCE_GC, 20 * 2000); return; } // If we are currently rotating the display, it will @@ -10033,7 +10033,7 @@ public class WindowManagerService extends IWindowManager.Stub // processes holds on others can be released if they are // no longer needed. mH.removeMessages(H.FORCE_GC); - mH.sendEmptyMessageDelayed(H.FORCE_GC, 2000); + mH.sendEmptyMessageDelayed(H.FORCE_GC, 20 * 2000); mScreenFrozenLock.release(); |