Merge "Don't exit lock task on sleep"

2014-05-21 20:58:48 +00:00
parent f66bdfc240 2d437d0461
commit 711b7a5428
1 changed files with 0 additions and 1 deletions
--- 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) {