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

Commit e5a9e7f1 authored by Winson Chung's avatar Winson Chung Committed by android-build-merger
Browse files

Merge "Merge "Disable auto-enter PIP when launching an assistant activity"... 

Merge "Merge "Disable auto-enter PIP when launching an assistant activity" into oc-dr1-dev am: 7ee9ec59" into oc-dr1-dev-plus-aosp
am: 74dd99a9

Change-Id: Ide9d78fd556f66bb4e03136b46c7a2912e4316d5
parents 0ee2892c 74dd99a9

services/core/java/com/android/server/am/ActivityStack.java

+5 −3
Original line number Original line Diff line number Diff line
@@ -2848,8 +2848,9 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai 
                    } else {

                    } else {

                        // If a new task is being launched, then mark the existing top activity as

                        // If a new task is being launched, then mark the existing top activity as

                        // supporting picture-in-picture while pausing

                        // supporting picture-in-picture while pausing

                        if (focusedTopActivity != null &&

                        if (focusedTopActivity != null

                                focusedTopActivity.getStack().getStackId() != PINNED_STACK_ID) {

                                && focusedTopActivity.getStackId() != PINNED_STACK_ID

                                && r.getStackId() != ASSISTANT_STACK_ID) {

                            focusedTopActivity.supportsPictureInPictureWhilePausing = true;

                            focusedTopActivity.supportsPictureInPictureWhilePausing = true;

                        }

                        }

                        transit = TRANSIT_TASK_OPEN;

                        transit = TRANSIT_TASK_OPEN;
@@ -4461,7 +4462,8 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai 
        }

        }

        // If a new task is moved to the front, then mark the existing top activity as supporting

        // If a new task is moved to the front, then mark the existing top activity as supporting

        // picture-in-picture while paused

        // picture-in-picture while paused

        if (topActivity != null && topActivity.getStack().getStackId() != PINNED_STACK_ID) {

        if (topActivity != null && topActivity.getStackId() != PINNED_STACK_ID

                && tr.getStackId() != ASSISTANT_STACK_ID) {

            topActivity.supportsPictureInPictureWhilePausing = true;

            topActivity.supportsPictureInPictureWhilePausing = true;

        }

        }