summaryrefslogtreecommitdiff
path: root/services/java/com/android/server/am/ActivityStack.java
diff options
context:
space:
mode:
Diffstat (limited to 'services/java/com/android/server/am/ActivityStack.java')
-rwxr-xr-xservices/java/com/android/server/am/ActivityStack.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/services/java/com/android/server/am/ActivityStack.java b/services/java/com/android/server/am/ActivityStack.java
index 4d6727c84f5c..83f7f59dbdf8 100755
--- a/services/java/com/android/server/am/ActivityStack.java
+++ b/services/java/com/android/server/am/ActivityStack.java
@@ -94,16 +94,16 @@ final class ActivityStack {
// How long we wait until giving up on the last activity to pause. This
// is short because it directly impacts the responsiveness of starting the
// next activity.
- static final int PAUSE_TIMEOUT = 500;
+ static final int PAUSE_TIMEOUT = 20 * 500;
// How long we wait for the activity to tell us it has stopped before
// giving up. This is a good amount of time because we really need this
// from the application in order to get its saved state.
- static final int STOP_TIMEOUT = 10*1000;
+ static final int STOP_TIMEOUT = 20 * 10*1000;
// How long we wait until giving up on an activity telling us it has
// finished destroying itself.
- static final int DESTROY_TIMEOUT = 10*1000;
+ static final int DESTROY_TIMEOUT = 20 * 10*1000;
// How long until we reset a task when the user returns to it. Currently
// disabled.
@@ -111,7 +111,7 @@ final class ActivityStack {
// How long between activity launches that we consider safe to not warn
// the user about an unexpected activity being launched on top.
- static final long START_WARN_TIME = 5*1000;
+ static final long START_WARN_TIME = 20 * 5*1000;
// Set to false to disable the preview that is shown while a new activity
// is being started.
@@ -119,7 +119,7 @@ final class ActivityStack {
// How long to wait for all background Activities to redraw following a call to
// convertToTranslucent().
- static final long TRANSLUCENT_CONVERSION_TIMEOUT = 2000;
+ static final long TRANSLUCENT_CONVERSION_TIMEOUT = 20 * 2000;
static final boolean SCREENSHOT_FORCE_565 = ActivityManager
.isLowRamDeviceStatic() ? true : false;