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

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

Merge "Make WindowContainer stop implementing InsetsControlTarget" into main

parents 8933a981 daab4e4b

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

+2 −2
Original line number Diff line number Diff line
@@ -490,9 +490,9 @@ final class ContentRecorder implements WindowContainerListener { 
        toSearch.add(recordedWindowContainer);

        while (!toSearch.isEmpty()) {

            final WindowContainer<?> wc = toSearch.poll();

            if (wc != null && wc.getWindow() != null

            if (wc != null && wc.asWindowState() != null

                    && wc.getWindowType() == WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY

                    && wc.getWindow().mOwnerUid

                    && wc.asWindowState().mOwnerUid

                    == mContentRecordingSession.getRecordingOwnerUid()) {

                return wc.getSurfaceControl();

            }

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

+1 −2
Original line number Diff line number Diff line
@@ -113,8 +113,7 @@ import java.util.function.Predicate; 
 * changes are made to this class.

 */

class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<E>

        implements Comparable<WindowContainer>, Animatable,

        InsetsControlTarget {

        implements Comparable<WindowContainer>, Animatable {



    private static final String TAG = TAG_WITH_CLASS_NAME ? "WindowContainer" : TAG_WM;