summaryrefslogtreecommitdiffstats
path: root/services/core
diff options
context:
space:
mode:
authorJason Monk <jmonk@google.com>2014-05-21 16:06:53 -0400
committerJason Monk <jmonk@google.com>2014-05-21 16:06:53 -0400
commit2d437d04614ba79ad54546b05f9aec93a479b603 (patch)
tree493b042d66ab1eead0dadc0d70c567fd489c914e /services/core
parent38dfba03d5c7dd6069a9460729fbce4d317f25a2 (diff)
downloadframeworks_base-2d437d04614ba79ad54546b05f9aec93a479b603.zip
frameworks_base-2d437d04614ba79ad54546b05f9aec93a479b603.tar.gz
frameworks_base-2d437d04614ba79ad54546b05f9aec93a479b603.tar.bz2
Don't exit lock task on sleep
Change-Id: I332088ce31ce06a771461a78fcc63f4afc824813
Diffstat (limited to 'services/core')
-rw-r--r--services/core/java/com/android/server/am/ActivityStackSupervisor.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
index ef9c711..252c0bb 100644
--- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
@@ -2312,7 +2312,6 @@ public final class ActivityStackSupervisor implements DisplayListener {
}
}
checkReadyForSleepLocked();
- setLockTaskModeLocked(null);
}
boolean shutdownLocked(int timeout) {