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

Commit 3a89f881 authored by Chris Li's avatar Chris Li
Browse files

Only move Task to PiP if there is only one non-finishing activity 

Bug: 225371112
Test: pass existing
Change-Id: I9c68e3932940b7932db5f1dd4045170e66aa2dba
Merged-In: I9c68e3932940b7932db5f1dd4045170e66aa2dba
parent 0b87da71

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

+1 −2
Original line number Diff line number Diff line
@@ -2007,8 +2007,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> 
            r.getDisplayContent().prepareAppTransition(TRANSIT_NONE);



            final TaskFragment organizedTf = r.getOrganizedTaskFragment();

            // TODO: Does it make sense to only count non-finishing activities?

            final boolean singleActivity = task.getActivityCount() == 1;

            final boolean singleActivity = task.getNonFinishingActivityCount() == 1;

            final Task rootTask;

            if (singleActivity) {

                rootTask = task;

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

+0 −8
Original line number Diff line number Diff line
@@ -1380,14 +1380,6 @@ class Task extends TaskFragment { 
        return getActivity(ActivityRecord::canBeTopRunning);

    }



    int getActivityCount() {

        final int[] activityCount = new int[1];

        forAllActivities(ar -> {

            activityCount[0]++;

        });

        return activityCount[0];

    }



    /**

     * Return true if any activities in this task belongs to input uid.

     */