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

Commit 51dc2014 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix private displays UID tracking" into main

parents d758b4e5 7a4c24ee

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

+0 −4
Original line number Diff line number Diff line
@@ -1548,10 +1548,6 @@ class Task extends TaskFragment { 
            getDisplayArea().addRootTaskReferenceIfNeeded((Task) child);

        }



        // Make sure the list of display UID allowlists is updated

        // now that this record is in a new task.

        mRootWindowContainer.updateUIDsPresentOnDisplay();



        // Only pass minimum dimensions for pure TaskFragment. Task's minimum dimensions must be

        // passed from Task constructor.

        final TaskFragment childTaskFrag = child.asTaskFragment();

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

+4 −0
Original line number Diff line number Diff line
@@ -2273,6 +2273,10 @@ class TaskFragment extends WindowContainer<WindowContainer> { 
        if (hostProcess != null) {

            hostProcess.addEmbeddedActivity(addingActivity);

        }



        // Make sure the list of display UID allowlists is updated

        // now that this record is in a new task fragment.

        mRootWindowContainer.updateUIDsPresentOnDisplay();

    }



    @Override