diff options
| author | Jason Monk <jmonk@google.com> | 2014-05-21 20:58:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-21 20:58:48 +0000 |
| commit | 711b7a5428041a39512b540402a654d149152261 (patch) | |
| tree | e76a1a4902e2293393db268e623acbd0a5316f1a /services/core | |
| parent | f66bdfc2407297f0d9bef4b17670074a2cc08a2c (diff) | |
| parent | 2d437d04614ba79ad54546b05f9aec93a479b603 (diff) | |
| download | frameworks_base-711b7a5428041a39512b540402a654d149152261.zip frameworks_base-711b7a5428041a39512b540402a654d149152261.tar.gz frameworks_base-711b7a5428041a39512b540402a654d149152261.tar.bz2 | |
Merge "Don't exit lock task on sleep"
Diffstat (limited to 'services/core')
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityStackSupervisor.java | 1 |
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) { |