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

Commit 16805b4c authored by Chavi Weingarten's avatar Chavi Weingarten Committed by Android (Google) Code Review
Browse files

Merge "Cache IWindow in InputWindowHandle" into sc-v2-dev

parents c2e1a34b 911be61b
Loading
Loading
Loading
Loading
+12 −2
Original line number Diff line number Diff line
@@ -49,6 +49,11 @@ public final class InputWindowHandle {
     */
    @Nullable
    private IBinder windowToken;
    /**
     * Used to cache IWindow from the windowToken so we don't need to convert every time getWindow
     * is called.
     */
    private IWindow window;

    // The window name.
    public String name;
@@ -151,7 +156,7 @@ public final class InputWindowHandle {
                .append(", visible=").append(visible)
                .append(", scaleFactor=").append(scaleFactor)
                .append(", transform=").append(transform)
                .append(", windowToken=").append(getWindow())
                .append(", windowToken=").append(windowToken)
                .toString();

    }
@@ -186,9 +191,14 @@ public final class InputWindowHandle {

    public void setWindowToken(IWindow iwindow) {
        windowToken = iwindow.asBinder();
        window = iwindow;
    }

    public IWindow getWindow() {
        return IWindow.Stub.asInterface(windowToken);
        if (window != null) {
            return window;
        }
        window = IWindow.Stub.asInterface(windowToken);
        return window;
    }
}