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

Commit e15dd1ff authored by Chris Li's avatar Chris Li Committed by Automerger Merge Worker
Browse files

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

Merge "Only move Task to PiP if there is only one non-finishing activity" into tm-qpr-dev am: 4c61bbfe

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17743157



Change-Id: I39ff9632f48151a8635eac9f8278e111ca76e47f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 441999bf 4c61bbfe

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;

            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.

     */