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

Commit b9abece8 authored by Louis Chang's avatar Louis Chang
Browse files

Auto remove the embedded task from Recents 

The embedded task was displayed in Recents because
we won't be able to tell if the task is embedded
once the task is removed from the wm hierarchy.

Bug: 194243805
Test: not showing embedded task in Recents

Change-Id: I045ebad855b19a7711af3426d78f02d3f247d29c
parent 4c06d013

services/core/java/com/android/server/wm/Task.java

+5 −4
Original line number Diff line number Diff line
@@ -723,7 +723,7 @@ class Task extends TaskFragment { 
            } catch (RemoteException e) {

            }

        }

        if (autoRemoveFromRecents() || isVoiceSession) {

        if (autoRemoveFromRecents(oldParent.asTaskFragment()) || isVoiceSession) {

            // Task creator asked to remove this when done, or this task was a voice

            // interaction, so it should not remain on the recent tasks list.

            mTaskSupervisor.mRecentTasks.remove(this);
@@ -1575,11 +1575,12 @@ class Task extends TaskFragment { 
        return count > 0;

    }



    private boolean autoRemoveFromRecents() {

    private boolean autoRemoveFromRecents(TaskFragment oldParentFragment) {

        // We will automatically remove the task either if it has explicitly asked for

        // this, or it is empty and has never contained an activity that got shown to

        // the user.

        return autoRemoveRecents || (!hasChild() && !getHasBeenVisible());

        // the user, or it was being embedded in another Task.

        return autoRemoveRecents || (!hasChild() && !getHasBeenVisible()

                || (oldParentFragment != null && oldParentFragment.isEmbedded()));

    }



    private void clearPinnedTaskIfNeed() {