am 722b15e0: Merge "Fix a regression in pausing activity immediately on sleep" into klp-dev

* commit '722b15e00065bebfd711a34123a64b1c4a65d8f7': Fix a regression in pausing activity immediately on sleep
2013-09-19 15:46:19 -07:00
parent f3c61c6657 722b15e000
commit 638918a268
1 changed files with 1 additions and 1 deletions
--- a/services/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/java/com/android/server/am/ActivityStackSupervisor.java
@@ -2105,12 +2105,12 @@ public final class ActivityStackSupervisor {
                mService.mHandler.removeMessages(LAUNCH_TIMEOUT_MSG);
            }
        }
+        checkReadyForSleepLocked();
    }

    boolean shutdownLocked(int timeout) {
        boolean timedout = false;
        goingToSleepLocked();
-        checkReadyForSleepLocked();

        final long endTime = System.currentTimeMillis() + timeout;
        while (true) {