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

Commit e81c978d authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Add isTrustedOverlay field to WindowInfo" into udc-dev am: 182f57ef am: b6a6ab26"

parents 78f3a311 77f60cbd
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -3990,6 +3990,7 @@ package android.window {

  public static class WindowInfosListenerForTest.WindowInfo {
    field @NonNull public final android.graphics.Rect bounds;
    field public final boolean isTrustedOverlay;
    field @NonNull public final String name;
    field @NonNull public final android.os.IBinder windowToken;
  }
+10 −2
Original line number Diff line number Diff line
@@ -63,10 +63,17 @@ public class WindowInfosListenerForTest {
        @NonNull
        public final Rect bounds;

        WindowInfo(@NonNull IBinder windowToken, @NonNull String name, @NonNull Rect bounds) {
        /**
         * True if the window is a trusted overlay.
         */
        public final boolean isTrustedOverlay;

        WindowInfo(@NonNull IBinder windowToken, @NonNull String name, @NonNull Rect bounds,
                int inputConfig) {
            this.windowToken = windowToken;
            this.name = name;
            this.bounds = bounds;
            this.isTrustedOverlay = (inputConfig & InputConfig.TRUSTED_OVERLAY) != 0;
        }
    }

@@ -129,7 +136,8 @@ public class WindowInfosListenerForTest {
            }
            var bounds = new Rect(handle.frameLeft, handle.frameTop, handle.frameRight,
                    handle.frameBottom);
            windowInfos.add(new WindowInfo(handle.getWindowToken(), handle.name, bounds));
            windowInfos.add(new WindowInfo(handle.getWindowToken(), handle.name, bounds,
                    handle.inputConfig));
        }
        return windowInfos;
    }