diff options
| -rw-r--r-- | cmds/interrupter/Android.mk | 4 | ||||
| -rw-r--r-- | services/java/com/android/server/am/ActivityManagerService.java | 4 | ||||
| -rw-r--r-- | services/java/com/android/server/power/PowerManagerService.java | 5 |
3 files changed, 8 insertions, 5 deletions
diff --git a/cmds/interrupter/Android.mk b/cmds/interrupter/Android.mk index e324627517ec..54fa1f4b4172 100644 --- a/cmds/interrupter/Android.mk +++ b/cmds/interrupter/Android.mk @@ -16,6 +16,6 @@ LOCAL_SRC_FILES := \ interrupter.c LOCAL_MODULE := interrupter LOCAL_MODULE_TAGS := eng tests -LOCAL_LDFLAGS := -ldl +LOCAL_LDLIBS := -ldl -include $(BUILD_HOST_SHARED_LIBRARY)
\ No newline at end of file +include $(BUILD_HOST_SHARED_LIBRARY) diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index 3ba90981eeed..a2701e45af98 100644 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java @@ -299,10 +299,10 @@ public final class ActivityManagerService extends ActivityManagerNative static final int BROADCAST_BG_TIMEOUT = 60*1000; // How long we wait until we timeout on key dispatching. - static final int KEY_DISPATCHING_TIMEOUT = 5*1000; + static final int KEY_DISPATCHING_TIMEOUT = 5*1000*10; // How long we wait until we timeout on key dispatching during instrumentation. - static final int INSTRUMENTATION_KEY_DISPATCHING_TIMEOUT = 60*1000; + static final int INSTRUMENTATION_KEY_DISPATCHING_TIMEOUT = 60*1000*10; // Amount of time we wait for observers to handle a user switch before // giving up on them and unfreezing the screen. diff --git a/services/java/com/android/server/power/PowerManagerService.java b/services/java/com/android/server/power/PowerManagerService.java index 8fbde14897e8..d1cad14d74c3 100644 --- a/services/java/com/android/server/power/PowerManagerService.java +++ b/services/java/com/android/server/power/PowerManagerService.java @@ -1468,7 +1468,10 @@ public final class PowerManagerService extends IPowerManager.Stub * to being fully awake or else go to sleep for good. */ private boolean isItBedTimeYetLocked() { - return mBootCompleted && !isBeingKeptAwakeLocked(); + if (SystemProperties.getBoolean("ro.disablesuspend", false)) + return false; + else + return mBootCompleted && !isBeingKeptAwakeLocked(); } /** |