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

Commit d8bffe7b authored by Patrick Williams's avatar Patrick Williams Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21944440



Change-Id: I3d9ab5457caaed2956c35fd96a420861220a4b6d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8b94993e 182f57ef

core/api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -3986,6 +3986,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;

  }

core/java/android/window/WindowInfosListenerForTest.java

+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;

    }