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

Commit 8a5e85c9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Block root task from being shown in recents" into pi-dev

parents e7b74370 7dcbfb02

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

+10 −0
Original line number Diff line number Diff line
@@ -285,6 +285,16 @@ public class LockTaskController { 
        return false;

    }



    /**

     * @return the root task of the lock task.

     */

    TaskRecord getRootTask() {

        if (mLockTaskModeTasks.isEmpty()) {

            return null;

        }

        return mLockTaskModeTasks.get(0);

    }



    private boolean isLockTaskModeViolationInternal(TaskRecord task, boolean isNewClearTask) {

        // TODO: Double check what's going on here. If the task is already in lock task mode, it's

        // likely whitelisted, so will return false below.

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

+5 −0
Original line number Diff line number Diff line
@@ -1155,6 +1155,11 @@ class RecentTasks { 
                }

        }



        // If we're in lock task mode, ignore the root task

        if (task == mService.mLockTaskController.getRootTask()) {

            return false;

        }



        return true;

    }