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

Commit 99b30edb authored by Chris Li's avatar Chris Li Committed by Android (Google) Code Review
Browse files

Merge "Only move Task to PiP if there is only one non-finishing activity" into tm-dev

parents 1b43c023 3a89f881

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.

     */