commit ce15e157a6cf56fc73961ccb8c5ab18b1bf70280
author Amith Yamasani <yamasani@google.com> Thu Sep 19 12:30:32 2013 -0700
committer Amith Yamasani <yamasani@google.com> Thu Sep 19 14:30:47 2013 -0700
tree 6a51d76496ef1c24806bf359c09eff732a922c46
parent 7301bd96c43f1a3604e88612c1a4214d57f88000

Fix a regression in pausing activity immediately on sleep

At some point during refactoring of ActivityStack, the code to pause the current
activity got deleted. Added back that line of code. Activity will now pause
as soon as the screen is turned off, rather than after 5 seconds (sleep timeout).

Bug: 10632898

Change-Id: If3cc8708d692d29a13dbd8cfd9edda8883b38c2e

services/java/com/android/server/am/ActivityStackSupervisor.java

diff --git a/services/java/com/android/server/am/ActivityStackSupervisor.java b/services/java/com/android/server/am/ActivityStackSupervisor.java
index 219cb85..9ae049f 100644
--- a/services/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/java/com/android/server/am/ActivityStackSupervisor.java
@@ -2076,12 +2076,12 @@
                 mService.mHandler.removeMessages(LAUNCH_TIMEOUT_MSG);
             }
         }
+        checkReadyForSleepLocked();
     }
 
     boolean shutdownLocked(int timeout) {
         boolean timedout = false;
         goingToSleepLocked();
-        checkReadyForSleepLocked();
 
         final long endTime = System.currentTimeMillis() + timeout;
         while (true) {