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

Commit abc23587 authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Lock task doesn't always end properly." into lmp-dev

parents 163a8053 835495c1

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

+4 −0
Original line number Diff line number Diff line
@@ -3189,7 +3189,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);

        }

    }