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

Commit 9060da6c authored by armenk's avatar armenk
Browse files

Set focused app when top activity is resumed 

In a multi-resumed environment, like in a freeform device, the top
activity can be resumed but it might not be the focused app. This
causes some failures in Pip tests. To fix it, the top activity can
be explicitly set to the focused app in TaskFragment.resumeTopActivity()
function.

Bug: 194224954
Test: atest PinnedStackTests#testEnterPictureInPictureMode

Change-Id: I646c9950e74c589c155a32a787b5165598cecb61
parent 8981d131

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

+4 −0
Original line number Diff line number Diff line
@@ -945,6 +945,10 @@ class TaskFragment extends WindowContainer<WindowContainer> { 
            // we still want to check if the visibility of other windows have changed (e.g. bringing

            // a fullscreen window forward to cover another freeform activity.)

            if (taskDisplayArea.inMultiWindowMode()) {

                if (taskDisplayArea.mDisplayContent != null

                        && taskDisplayArea.mDisplayContent.mFocusedApp != next) {

                    taskDisplayArea.mDisplayContent.setFocusedApp(next);

                }

                taskDisplayArea.ensureActivitiesVisible(null /* starting */, 0 /* configChanges */,

                        false /* preserveWindows */, true /* notifyClients */);

            }