Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 835495c1 authored by Jason Monk's avatar Jason Monk
Browse files

Lock task doesn't always end properly. 

This can result in the keyguard not being re-enabled, the status
bar being in a bad state, and various other weirdness.  When a task
is going away, it needs to send the standard lock task ending
messages so that exiting the state can be handled properly.

Bug: 16010327
Change-Id: Id7ee632f4765af0af209b70fb69dd75f2e541820
parent 03374ccc

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

+4 −0
Original line number Diff line number Diff line
@@ -3182,7 +3182,11 @@ public final class ActivityStackSupervisor implements DisplayListener { 


    void endLockTaskModeIfTaskEnding(TaskRecord task) {

        if (mLockTaskModeTask != null && mLockTaskModeTask == task) {

            final Message lockTaskMsg = Message.obtain();

            lockTaskMsg.arg1 = mLockTaskModeTask.userId;

            lockTaskMsg.what = LOCK_TASK_END_MSG;

            mLockTaskModeTask = null;

            mHandler.sendMessage(lockTaskMsg);

        }

    }