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

Commit d6c3a1f0 authored by Ikram Gabiyev's avatar Ikram Gabiyev Committed by Android (Google) Code Review
Browse files

Merge "Only move to pinned task if activity non finishing" into main

parents bb41188b 531b9037

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

+2 −3
Original line number Diff line number Diff line
@@ -1442,9 +1442,8 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub 
                            + " as there is no valid task provided");

                    break;

                }

                ActivityRecord pipActivity = pipTaskFragment.getActivity(

                        (activity) -> activity.pictureInPictureArgs != null);

                if (pipActivity == null) {

                ActivityRecord pipActivity = pipTaskFragment.getTopNonFinishingActivity();

                if (pipActivity == null || pipActivity.pictureInPictureArgs == null) {

                    Slog.w(TAG, "Skip applying hierarchy operation " + hop

                            + " as the provided task has no PiP-able activity");

                    break;