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

Commit 3bd90617 authored by Christopher Tate's avatar Christopher Tate
Browse files

Don't end lock task mode when not in lock task mode 

Change-Id: I3724d68ed7116d47024638d56c5bf43c4866f82e
parent 0d8acb2c

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

+10 −6
Original line number Diff line number Diff line
@@ -3005,13 +3005,15 @@ public final class ActivityStackSupervisor implements DisplayListener { 
    }



    void setLockTaskModeLocked(TaskRecord task) {

        final Message lockTaskMsg = Message.obtain();

        if (task == null) {

            // Take out of lock task mode.

            // Take out of lock task mode if necessary

            if (mLockTaskModeTask != null) {

                final Message lockTaskMsg = Message.obtain();

                lockTaskMsg.arg1 = mLockTaskModeTask.userId;

                lockTaskMsg.what = LOCK_TASK_END_MSG;

                mLockTaskModeTask = null;

                mHandler.sendMessage(lockTaskMsg);

            }

            return;

        }

        if (isLockTaskModeViolation(task)) {
@@ -3021,6 +3023,8 @@ public final class ActivityStackSupervisor implements DisplayListener { 
        mLockTaskModeTask = task;

        findTaskToMoveToFrontLocked(task, 0, null);

        resumeTopActivitiesLocked();



        final Message lockTaskMsg = Message.obtain();

        lockTaskMsg.obj = mLockTaskModeTask.intent.getComponent().getPackageName();

        lockTaskMsg.arg1 = mLockTaskModeTask.userId;

        lockTaskMsg.what = LOCK_TASK_START_MSG;