diff options
| -rwxr-xr-x | services/core/java/com/android/server/am/ActivityManagerService.java | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 9228fc6586a5..351bc4a6876e 100755 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -937,13 +937,6 @@ public final class ActivityManagerService extends ActivityManagerNative private boolean mRunningVoice = false; /** - * Set while the keyguard is waiting for an activity to draw. - * In this state, if we are sleeping, we allow Activities to launch - * so that they can draw before Keyguard dismisses itself. - */ - private boolean mKeyguardWaitingForDraw = false; - - /** * State of external calls telling us if the device is asleep. */ private boolean mWentToSleep = false; @@ -6249,7 +6242,10 @@ public final class ActivityManagerService extends ActivityManagerNative synchronized (this) { if (DEBUG_LOCKSCREEN) logLockScreen(""); mWindowManager.keyguardWaitingForActivityDrawn(); - mKeyguardWaitingForDraw = true; + if (mLockScreenShown) { + mLockScreenShown = false; + comeOutOfSleepIfNeededLocked(); + } } } finally { Binder.restoreCallingIdentity(token); @@ -9952,7 +9948,7 @@ public final class ActivityManagerService extends ActivityManagerNative } public boolean isSleeping() { - return mSleeping && !mKeyguardWaitingForDraw; + return mSleeping; } void goingToSleep() { @@ -9973,7 +9969,6 @@ public final class ActivityManagerService extends ActivityManagerNative if (mWentToSleep && !mRunningVoice) { if (!mSleeping) { mSleeping = true; - mKeyguardWaitingForDraw = false; mStackSupervisor.goingToSleepLocked(); // Initialize the wake times of all processes. @@ -10082,7 +10077,6 @@ public final class ActivityManagerService extends ActivityManagerNative try { if (DEBUG_LOCKSCREEN) logLockScreen(" shown=" + shown); mLockScreenShown = shown; - mKeyguardWaitingForDraw = false; comeOutOfSleepIfNeededLocked(); } finally { Binder.restoreCallingIdentity(ident); |