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

Commit 5d65eeea authored by Benjamin Franz's avatar Benjamin Franz Committed by android-build-merger
Browse files

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

am: 8a5e85c9

Change-Id: Ied185646430eb0b8bff72741e2697e6f35fa468b
parents aea7e115 8a5e85c9

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;

    }