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

Commit 1b8d1f91 authored by Louis Chang's avatar Louis Chang Committed by Android (Google) Code Review
Browse files

Merge "Clear the focused app after reset adjacent TaskFragments" into tm-qpr-dev

parents 91d2c6f5 c4b1aa47

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

+8 −0
Original line number Diff line number Diff line
@@ -1005,6 +1005,14 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub 
                tf1.setAdjacentTaskFragment(tf2);

                effects |= TRANSACT_EFFECTS_LIFECYCLE;



                // Clear the focused app if the focused app is no longer visible after reset the

                // adjacent TaskFragments.

                if (tf2 == null && tf1.getDisplayContent().mFocusedApp != null

                        && tf1.hasChild(tf1.getDisplayContent().mFocusedApp)

                        && !tf1.shouldBeVisible(null /* starting */)) {

                    tf1.getDisplayContent().setFocusedApp(null);

                }



                final Bundle bundle = hop.getLaunchOptions();

                final WindowContainerTransaction.TaskFragmentAdjacentParams adjacentParams =

                        bundle != null ? new WindowContainerTransaction.TaskFragmentAdjacentParams(