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

Commit 4ae65c7a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Inform WindowManager when Activity is reordered to front."

parents ef0cda63 d58d7b3e

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

+3 −0
Original line number Diff line number Diff line
@@ -1139,6 +1139,9 @@ class TaskRecord extends ConfigurationContainer implements TaskWindowContainerLi 


        mActivities.remove(newTop);

        mActivities.add(newTop);



        // Make sure window manager is aware of the position change.

        mWindowContainerController.positionChildAtTop(newTop.mWindowContainerController);

        updateEffectiveIntent();



        setFrontOfTask();

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

+4 −0
Original line number Diff line number Diff line
@@ -103,6 +103,10 @@ public class TaskWindowContainerController 
        }

    }



    public void positionChildAtTop(AppWindowContainerController childController) {

        positionChildAt(childController, POSITION_TOP);

    }



    public void positionChildAt(AppWindowContainerController childController, int position) {

        synchronized(mService.mWindowMap) {

            final AppWindowToken aToken = childController.mContainer;