commit 9ef94019386183cb88ad090965418ef294bbb79a
author Jeff Brown <jeffbrown@google.com> Fri Nov 21 13:04:42 2014 -0800
committer Jeff Brown <jeffbrown@google.com> Fri Nov 21 21:35:08 2014 +0000
tree d228dc5ec3461d486332d24c606601c7470d3573
parent ace33655bff514698b322253c211f0af5a3edd37
parent 694c1d2b2d9290d06607500e03851805e8b8e6d7

resolved conflicts for merge of 694c1d2b to lmp-mr1-dev

Change-Id: I9a9b724e0fd12aa161ff276540431b9d8e218e2b

services/core/java/com/android/server/am/ActivityStack.java

diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java
index c8b7205..5a948f9 100755
--- a/services/core/java/com/android/server/am/ActivityStack.java
+++ b/services/core/java/com/android/server/am/ActivityStack.java
@@ -1477,7 +1477,7 @@
             mStackSupervisor.inResumeTopActivity = true;
             if (mService.mLockScreenShown == ActivityManagerService.LOCK_SCREEN_LEAVING) {
                 mService.mLockScreenShown = ActivityManagerService.LOCK_SCREEN_HIDDEN;
-                mService.comeOutOfSleepIfNeededLocked();
+                mService.updateSleepIfNeededLocked();
             }
             result = resumeTopActivityInnerLocked(prev, options);
         } finally {