Merge "Cache IWindow in InputWindowHandle" into sc-v2-dev am: 16805b4c7e am: 16a27e576d (80908af6) · Commits · e / os / android_frameworks_base

core/java/android/view/InputWindowHandle.java

+12 −2

Original line number	Original line	Diff line number	Diff line
	@@ -47,6 +47,11 @@ public final class InputWindowHandle {
	*/		*/
	@Nullable		@Nullable
	private IBinder windowToken;		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.		// The window name.
	public String name;		public String name;
	@@ -145,7 +150,7 @@ public final class InputWindowHandle {
	.append(", visible=").append(visible)		.append(", visible=").append(visible)
	.append(", scaleFactor=").append(scaleFactor)		.append(", scaleFactor=").append(scaleFactor)
	.append(", transform=").append(transform)		.append(", transform=").append(transform)
	.append(", windowToken=").append(getWindow())		.append(", windowToken=").append(windowToken)
	.toString();		.toString();

	}		}
	@@ -180,9 +185,14 @@ public final class InputWindowHandle {

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

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