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

Commit daab4e4b authored by Tiger Huang's avatar Tiger Huang
Browse files

Make WindowContainer stop implementing InsetsControlTarget 

This should be done in commit e1b363d5
or it shouldn't be done in commit
f60944f1 in the first place. Because
non-WindowState WindowContainer never becomes a control target of any
source.

Bug: 199449177
Bug: 281029564
Flag: EXEMPT clean up
Test: presubmit
Change-Id: I594b5d286d47f6d0de298d9947de5de7f505d8d7
parent f6a30104

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
@@ -114,8 +114,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;